Commit 2cbabe63 authored by Marek Schoenherr's avatar Marek Schoenherr
Browse files

hendrik's tune (still awaiting final test),

needs update for CSS-variables from new W/Z+jets

K_PERP_MEAN_1                 1.10
K_PERP_MEAN_2                 1.10
K_PERP_SIGMA_1                0.85
K_PERP_SIGMA_2                0.85
PROFILE_PARAMETERS            0.759 0.576
RESCALE_EXPONENT              0.244
SCALE_MIN                     2.44
SIGMA_ND_FACTOR               0.34
CSS_IS_AS_FAC                 0.493
CSS_IS_PT2MIN                 4.78
COLOUR_RECONNECTION_STRENGTH  0.23
parent d4a1d41f
......@@ -109,7 +109,7 @@ void Hadronisation_Parameters::ReadParameters(string dir,string file)
dataread.GetValue<int>("Z_FORM",1);
// Parameters for kinematics of cluster decays
m_parametermap[string("colour_reconnection_strength")] =
dataread.GetValue<double>("COLOUR_RECONNECTION_STRENGTH",0.36);
dataread.GetValue<double>("COLOUR_RECONNECTION_STRENGTH",0.23);
m_parametermap[string("asfix")] =
dataread.GetValue<double>("AS_FIX",1.0);
m_parametermap[string("pt02")] =
......
......@@ -168,14 +168,14 @@ bool Simple_Chain::ReadInData()
if (!reader->VectorFromFile(m_regulation,"XS_REGULATION"))
m_regulation=std::vector<double>(1,2.68);
double exponent, scale;
if (!reader->ReadFromFile(exponent,"RESCALE_EXPONENT")) exponent=0.252;
if (!reader->ReadFromFile(exponent,"RESCALE_EXPONENT")) exponent=0.244;
if (!reader->ReadFromFile(scale,"REFERENCE_SCALE")) scale=1800.0;
m_regulation[0]*=pow(m_ecms/scale,exponent);
}
m_heavy_flavour = reader->GetValue<int>("MI_HEAVY_FLAVOUR",1);
if (!reader->ReadFromFile(m_error,"PS_ERROR")) m_error=1.e-2;
if (!reader->ReadFromFile(m_pathextra,"PATH_EXTRA")) m_pathextra="";
m_sigma_nd_fac = reader->GetValue<double>("SIGMA_ND_FACTOR",0.54);
m_sigma_nd_fac = reader->GetValue<double>("SIGMA_ND_FACTOR",0.34);
m_resdir = reader->GetValue<std::string>("MI_RESULT_DIRECTORY","");
m_ressuffix = reader->GetValue<std::string>("MI_RESULT_DIRECTORY_SUFFIX","");
GeneratePathName();
......@@ -413,8 +413,8 @@ bool Simple_Chain::Initialize()
p_read->ReadFromFile(xsfile,"XS_FILE");
SetInputFile(xsfile,1);
double stop, exponent, scale;
if (!p_read->ReadFromFile(stop,"SCALE_MIN")) stop=2.38;
if (!p_read->ReadFromFile(exponent,"RESCALE_EXPONENT")) exponent=0.252;
if (!p_read->ReadFromFile(stop,"SCALE_MIN")) stop=2.44;
if (!p_read->ReadFromFile(exponent,"RESCALE_EXPONENT")) exponent=0.244;
if (!p_read->ReadFromFile(scale,"REFERENCE_SCALE")) scale=1800.0;
stop*=pow(m_ecms/scale,exponent);
SetStop(stop,0);
......@@ -433,8 +433,8 @@ bool Simple_Chain::Initialize()
if (!p_read->ReadFromFile(function,"PROFILE_FUNCTION")) {
function="Double_Gaussian";
if (!p_read->VectorFromFile(parameters,"PROFILE_PARAMETERS")) {
parameters.push_back(0.364);
parameters.push_back(0.656);
parameters.push_back(0.759);
parameters.push_back(0.576);
}
}
else {
......
......@@ -857,9 +857,9 @@ void Initialization_Handler::SetGlobalVariables()
int evol = sdr.GetValue<int>("CSS_EVOLUTION_SCHEME",1);
int kfmode = sdr.GetValue<int>("CSS_KFACTOR_SCHEME",1);
double k0sqf = sdr.GetValue<double>("CSS_FS_PT2MIN",1.0);
double k0sqi = sdr.GetValue<double>("CSS_IS_PT2MIN",4.55);
double k0sqi = sdr.GetValue<double>("CSS_IS_PT2MIN",4.78);
double fs_as_fac = sdr.GetValue<double>("CSS_FS_AS_FAC",0.66);
double is_as_fac = sdr.GetValue<double>("CSS_IS_AS_FAC",0.538);
double is_as_fac = sdr.GetValue<double>("CSS_IS_AS_FAC",0.493);
double mth = sdr.GetValue<double>("CSS_MASS_THRESHOLD",0.0);
rpa->gen.SetVariable("CSS_EVOLUTION_SCHEME",ToString(evol));
rpa->gen.SetVariable("CSS_KFACTOR_SCHEME",ToString(kfmode));
......@@ -1070,7 +1070,9 @@ void Initialization_Handler::ExtractCommandLineParameters(int argc,char * argv[]
void Initialization_Handler::SetTuneParameters(const std::string tune)
{
std::vector<std::string> tuneparams;
if (tune == "NNPDF23" || tune == "NNPDF23_UEup" || tune == "NNPDF23_UEdown") {
if (tune == "NNPDF23" ||
tune == "NNPDF23_UEup" || tune == "NNPDF23_UEdown") {
THROW(fatal_error,"Currently there is no such tune.");
tuneparams.push_back("PDF_LIBRARY = LHAPDFSherpa");
tuneparams.push_back("PDF_SET = NNPDF23_nlo_as_0119.LHgrid");
tuneparams.push_back("K_PERP_MEAN_1 = 1.08");
......@@ -1083,38 +1085,45 @@ void Initialization_Handler::SetTuneParameters(const std::string tune)
if (tune == "NNPDF23_UEup") {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.358");
Read_Write_Base::AddCommandLine("MI_RESULT_DIRECTORY_SUFFIX _up;");
} else if (tune == "NNPDF23_UEdown") {
}
else if (tune == "NNPDF23_UEdown") {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.418");
Read_Write_Base::AddCommandLine("MI_RESULT_DIRECTORY_SUFFIX _down;");
} else {
}
else {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.388");
}
tuneparams.push_back("CSS_IS_AS_FAC = 0.872");
tuneparams.push_back("CSS_IS_PT2MIN = 2.21");
tuneparams.push_back("COLOUR_RECONNECTION_STRENGTH = 0.25");
} else if (tune == "CT10" || tune == "CT10_UEup" || tune == "CT10_UEdown") {
}
else if (tune == "CT10" ||
tune == "CT10_UEup" || tune == "CT10_UEdown") {
tuneparams.push_back("PDF_LIBRARY = CT10Sherpa");
tuneparams.push_back("PDF_SET = ct10");
tuneparams.push_back("K_PERP_MEAN_1 = 1.00");
tuneparams.push_back("K_PERP_MEAN_2 = 1.00");
tuneparams.push_back("K_PERP_SIGMA_1 = 1.38");
tuneparams.push_back("K_PERP_SIGMA_2 = 1.38");
tuneparams.push_back("PROFILE_PARAMETERS = 0.364 0.656");
tuneparams.push_back("RESCALE_EXPONENT = 0.252");
tuneparams.push_back("SCALE_MIN = 2.38");
tuneparams.push_back("K_PERP_MEAN_1 = 1.10");
tuneparams.push_back("K_PERP_MEAN_2 = 1.10");
tuneparams.push_back("K_PERP_SIGMA_1 = 0.85");
tuneparams.push_back("K_PERP_SIGMA_2 = 0.85");
tuneparams.push_back("PROFILE_PARAMETERS = 0.759 0.576");
tuneparams.push_back("RESCALE_EXPONENT = 0.244");
tuneparams.push_back("SCALE_MIN = 2.44");
if (tune == "CT10_UEup") {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.49");
tuneparams.push_back("SIGMA_ND_FACTOR = 0.31");
Read_Write_Base::AddCommandLine("MI_RESULT_DIRECTORY_SUFFIX _up;");
} else if (tune == "CT10_UEdown") {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.59");
}
else if (tune == "CT10_UEdown") {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.37");
Read_Write_Base::AddCommandLine("MI_RESULT_DIRECTORY_SUFFIX _down;");
} else {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.54");
}
tuneparams.push_back("CSS_IS_AS_FAC = 0.538");
tuneparams.push_back("CSS_IS_PT2MIN = 4.55");
tuneparams.push_back("COLOUR_RECONNECTION_STRENGTH = 0.36");
} else {
else {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.34");
}
tuneparams.push_back("CSS_IS_AS_FAC = 0.493");
tuneparams.push_back("CSS_IS_PT2MIN = 4.78");
tuneparams.push_back("COLOUR_RECONNECTION_STRENGTH = 0.23");
}
else {
msg_Error()<<"Ignoring unknown tune name \"" << tune << "\"" << std::endl;
return;
}
......
......@@ -30,8 +30,8 @@ Primordial_KPerp::Primordial_KPerp(std::string _m_path,std::string _m_file):
defaultsigma1(0.0), defaultsigma2(0.0);
if (rpa->gen.Beam1().IsHadron() && rpa->gen.Beam2().IsHadron()) {
if (rpa->gen.Beam1().Kfcode()==kf_p_plus) {
defaultmean1=1.00;
defaultsigma1=1.38;
defaultmean1=1.10;
defaultsigma1=0.85;
// Energy dependent scaling of K_PERP_SIGMA
defaultsigma1*=pow((rpa->gen.Ecms()/7000.),0.55);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment