Commit 946f724a authored by Hendrik Hoeth's avatar Hendrik Hoeth
Browse files

improved tuning values

parent e5d29d0b
......@@ -175,7 +175,7 @@ bool Simple_Chain::ReadInData()
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.34);
m_sigma_nd_fac = reader->GetValue<double>("SIGMA_ND_FACTOR",0.3425);
m_resdir = reader->GetValue<std::string>("MI_RESULT_DIRECTORY","");
m_ressuffix = reader->GetValue<std::string>("MI_RESULT_DIRECTORY_SUFFIX","");
GeneratePathName();
......@@ -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.759);
parameters.push_back(0.576);
parameters.push_back(0.76);
parameters.push_back(0.58);
}
}
else {
......
......@@ -859,7 +859,7 @@ void Initialization_Handler::SetGlobalVariables()
double k0sqf = sdr.GetValue<double>("CSS_FS_PT2MIN",1.0);
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.493);
double is_as_fac = sdr.GetValue<double>("CSS_IS_AS_FAC",0.50);
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));
......@@ -1105,7 +1105,7 @@ void Initialization_Handler::SetTuneParameters(const std::string tune)
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("PROFILE_PARAMETERS = 0.76 0.58");
tuneparams.push_back("RESCALE_EXPONENT = 0.244");
tuneparams.push_back("SCALE_MIN = 2.44");
if (tune == "CT10_UEup") {
......@@ -1113,13 +1113,13 @@ void Initialization_Handler::SetTuneParameters(const std::string tune)
Read_Write_Base::AddCommandLine("MI_RESULT_DIRECTORY_SUFFIX _up;");
}
else if (tune == "CT10_UEdown") {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.37");
tuneparams.push_back("SIGMA_ND_FACTOR = 0.38");
Read_Write_Base::AddCommandLine("MI_RESULT_DIRECTORY_SUFFIX _down;");
}
else {
tuneparams.push_back("SIGMA_ND_FACTOR = 0.34");
tuneparams.push_back("SIGMA_ND_FACTOR = 0.3425");
}
tuneparams.push_back("CSS_IS_AS_FAC = 0.493");
tuneparams.push_back("CSS_IS_AS_FAC = 0.50");
tuneparams.push_back("CSS_IS_PT2MIN = 4.78");
tuneparams.push_back("COLOUR_RECONNECTION_STRENGTH = 0.23");
}
......
......@@ -36,8 +36,8 @@ Primordial_KPerp::Primordial_KPerp(std::string _m_path,std::string _m_file):
defaultsigma1*=pow((rpa->gen.Ecms()/7000.),0.55);
}
if (rpa->gen.Beam2().Kfcode()==kf_p_plus) {
defaultmean2=1.00;
defaultsigma2=1.38;
defaultmean2=1.10;
defaultsigma2=0.85;
// Energy dependent scaling of K_PERP_SIGMA
defaultsigma2*=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