diff --git a/v2.5/toolkit/data/check/fnl1014_I902309_2-2_cpptest1.log b/v2.5/toolkit/data/check/fnl1014_I902309_2-2_cpptest1.log index 58ce74ccbe9ef14ad554fe92bd12700a24bf44e9..d2b3b9d64707bc4dc2dc8595015a11bd7e8433ed 100644 --- a/v2.5/toolkit/data/check/fnl1014_I902309_2-2_cpptest1.log +++ b/v2.5/toolkit/data/check/fnl1014_I902309_2-2_cpptest1.log @@ -1,4 +1,4 @@ - 1 3.000 1 0.000 0.5000 1 18.00 21.00 19.34 1.56017745945E+07 1.64609641193E+07 1.05507 1.39331 1.40000 - 2 3.000 1 0.000 0.5000 2 21.00 24.00 22.37 8.34458267620E+06 8.81388329577E+06 1.05624 1.35830 1.38000 - 3 3.000 2 0.5000 1.000 1 18.00 21.00 19.32 1.51487668648E+07 1.61411577100E+07 1.06551 1.40726 1.40000 - 4 3.000 2 0.5000 1.000 2 21.00 24.00 22.35 8.08819152921E+06 8.57754181383E+06 1.06050 1.38336 1.32000 + 1 3.000 1 0.000 0.5000 1 18.00 21.00 19.34 1.55667472757E+07 1.64230493128E+07 1.05501 1.39245 1.40000 + 2 3.000 1 0.000 0.5000 2 21.00 24.00 22.37 8.32640761744E+06 8.79417876595E+06 1.05618 1.35754 1.38000 + 3 3.000 2 0.5000 1.000 1 18.00 21.00 19.32 1.51147565052E+07 1.61037999706E+07 1.06544 1.40638 1.40000 + 4 3.000 2 0.5000 1.000 2 21.00 24.00 22.35 8.07057474245E+06 8.55832684231E+06 1.06044 1.38254 1.32000 diff --git a/v2.5/toolkit/data/check/fnl1014_I902309_2-2_rundecastest1.log b/v2.5/toolkit/data/check/fnl1014_I902309_2-2_rundecastest1.log index cc73ce6d6f06715f2c6b2b7ca2adadbcf40ebfa6..323e9f0be9c9c4d1dc4b573e34460d4100c6556f 100644 --- a/v2.5/toolkit/data/check/fnl1014_I902309_2-2_rundecastest1.log +++ b/v2.5/toolkit/data/check/fnl1014_I902309_2-2_rundecastest1.log @@ -1,4 +1,4 @@ - 1 3.000 1 0.000 0.5000 1 18.00 21.00 19.34 1.56016887283E+07 1.64608712252E+07 1.05507 1.39331 1.40000 - 2 3.000 1 0.000 0.5000 2 21.00 24.00 22.37 8.34454473387E+06 8.81384219248E+06 1.05624 1.35830 1.38000 - 3 3.000 2 0.5000 1.000 1 18.00 21.00 19.32 1.51486834905E+07 1.61410660330E+07 1.06551 1.40726 1.40000 - 4 3.000 2 0.5000 1.000 2 21.00 24.00 22.35 8.08815475042E+06 8.57750169336E+06 1.06050 1.38335 1.32000 + 1 3.000 1 0.000 0.5000 1 18.00 21.00 19.34 1.55666620448E+07 1.64229571138E+07 1.05501 1.39245 1.40000 + 2 3.000 1 0.000 0.5000 2 21.00 24.00 22.37 8.32636994898E+06 8.79413796273E+06 1.05618 1.35754 1.38000 + 3 3.000 2 0.5000 1.000 1 18.00 21.00 19.32 1.51146737478E+07 1.61037089813E+07 1.06544 1.40638 1.40000 + 4 3.000 2 0.5000 1.000 2 21.00 24.00 22.35 8.07053822914E+06 8.55828701506E+06 1.06044 1.38254 1.32000 diff --git a/v2.5/toolkit/src/fnlo-tk-cppread.cc b/v2.5/toolkit/src/fnlo-tk-cppread.cc index 25ac031347d6f24611c15d3446d3a3b78d59c86e..d0cb04355e9cd9f1c51992d5e49a02ce79795b45 100644 --- a/v2.5/toolkit/src/fnlo-tk-cppread.cc +++ b/v2.5/toolkit/src/fnlo-tk-cppread.cc @@ -134,8 +134,8 @@ int main(int argc, char** argv) { man << " If -7 < #vars < 0 then no. of additional mu_r, mu_f low fixed-scale variations to investigate, if possible." << endl; man << " If -13 < #vars < -6 then no. of additional mu_r, mu_f high fixed-scale variations to investigate, if possible." << endl; man << " If #vars == 0 then all PDF members are investigated for the default scale factors of (1,1)." << endl; - man << "[ascode]: Name of desired alpha_s evolution code, def. = GRV." << endl; - man << " Alternatives are: LHAPDF, RUNDEC, and" << endl; + man << "[ascode]: Name of desired alpha_s evolution code, def. = LHAPDF." << endl; + man << " Alternatives are: RUNDEC, GRV, and" << endl; man << " QCDNUM, or HOPPET, IF compiled with these options!" << endl; man << "[norm]: Normalize if applicable, def. = no." << endl; man << " Alternatives: \"yes\" or \"norm\"" << endl; @@ -153,7 +153,7 @@ int main(int argc, char** argv) { man << "[NLoop]: Set no. of loops to use in alpha_s evolution, def. = 2 (NLO)" << endl; man << " Alternatives: 1,3,4." << endl; man << " Only possible for [ascode] other than LHAPDF!" << endl; - man << "[asMz]: Set value of alpha_s(M_Z) to use in alpha_s evolution, def. = 0.1181 (PDG 2017)" << endl; + man << "[asMz]: Set value of alpha_s(M_Z) to use in alpha_s evolution, def. = 0.1180 (PDG 2023)" << endl; man << " Only possible for [ascode] other than LHAPDF!" << endl; man << "[Mz]: Set value of M_Z at which alpha_s(M_Z) is defined in alpha_s evolution, def. = 91.1876 (PDG)" << endl; man << " Only possible for [ascode] other than LHAPDF!" << endl; @@ -241,8 +241,8 @@ int main(int argc, char** argv) { AsEvolCode = (const char*) argv[4]; } if (argc <= 4 || AsEvolCode == "_") { - AsEvolCode = "GRV"; - shout["fnlo-tk-cppread"] << "No request for alpha_s evolution code, using GRV default." << endl; + AsEvolCode = "LHAPDF"; + shout["fnlo-tk-cppread"] << "No request for alpha_s evolution code, using LHAPDF default." << endl; } else { shout["fnlo-tk-cppread"] << "Using alpha_s evolution code: " << AsEvolCode << endl; } @@ -339,7 +339,7 @@ int main(int argc, char** argv) { } //--- Set value of alpha_s(M_Z) to use in alpha_s evolution ([ascode] other than LHAPDF only) - double asMz = 0.1181;// (PDG 2017) + double asMz = 0.1180;// (PDG 2023) if (argc > 10) { chtmp = (const char*) argv[10]; } @@ -528,10 +528,6 @@ int main(int argc, char** argv) { // fnlo.SetNLoop(4); // fnlo.SetMz(91.70); // - // (Note: CTEQ6M: M_Z = 91.70, alpha_s(M_Z) = 0.1179; - // PDG 2012: M_Z = 91.1876, alpha_s(M_Z) = 0.1184; - // PDG 2014: M_Z = 91.1876, alpha_s(M_Z) = 0.1185) - // // 2. @@ -569,10 +565,6 @@ int main(int argc, char** argv) { // // fnlo.SetAlphasMz(0.1179); // - // (Note: CTEQ6M: M_Z = 91.70, alpha_s(M_Z) = 0.1179; - // PDG 2012: M_Z = 91.1876, alpha_s(M_Z) = 0.1184; - // PDG 2014: M_Z = 91.1876, alpha_s(M_Z) = 0.1185) - // // To use a different alpha_s evolution code one has to interface it. // Here, for example, we use the above-mentioned CRunDec code: // @@ -933,14 +925,13 @@ int main(int argc, char** argv) { //! double asmz = fnlo->GetAlphasMz(Mz); //! cout << "Read from LHAPDF: alpha_s at M_Z = " << asmz << endl; if ( AsEvolCode != "LHAPDF" ) { - fnlo->SetAlphasMz(asMz);//! Default = 0.1181 (PDG 2017), else from command line; does not work with LHAPDF. + fnlo->SetAlphasMz(asMz);//! Default = 0.1180 (PDG 2023), else from command line; does not work with LHAPDF. //! fnlo->SetAlphasMz(0.1184);//! PDG 2012 +- 0.0007 //! fnlo->SetAlphasMz(0.1185);//! PDG 2013 +- 0.0006 //! fnlo->SetAlphasMz(0.1185);//! PDG 2014 +- 0.0006 //! fnlo->SetAlphasMz(0.1181);//! PDG 2015 +- 0.0013 //! fnlo->SetAlphasMz(0.1181);//! PDG 2017 +- 0.0011 - //! fnlo->SetAlphasMz(0.1180);//! CT10-NLO - //! fnlo->SetAlphasMz(0.1190);//! NNPDF21-NLO + //! fnlo->SetAlphasMz(0.1180);//! PDG 2023 +- 0.0009 } if ( AsEvolCode != "LHAPDF" ) { diff --git a/v2.5/toolkit/src/fnlo-tk-rootout.cc b/v2.5/toolkit/src/fnlo-tk-rootout.cc index 8949a9134573e70a0677eee61b9c53d9f5745644..fe1c78986b0eb034b7391c3fd7d6a3b9bcac37f8 100644 --- a/v2.5/toolkit/src/fnlo-tk-rootout.cc +++ b/v2.5/toolkit/src/fnlo-tk-rootout.cc @@ -531,22 +531,6 @@ int main(int argc, char** argv) { fastNLOTools::PrintXSUncertainty(XsUnc, UncName); } - // //! Print out of results - // if ( XsUnc.xs.size() ) { - // yell << _CSEPSC << endl; - // shout << "fnlo-tk-rootout: Evaluating uncertainties" << endl; - // yell << _CSEPSC << endl; - // yell << _DSEPSC << endl; - // yell << buffer << endl; - // yell << _SSEPSC << endl; - // shout << "bin cross_section lower_uncertainty upper_uncertainty" << endl; - // yell << _TSEPSC << endl; - // for ( unsigned int iobs=0;iobs<XsUnc.xs.size();iobs++ ) { - // printf("%5.i %#18.11E %#18.11E %#18.11E\n",iobs+1,XsUnc.xs[iobs],XsUnc.dxsl[iobs],XsUnc.dxsu[iobs]); - // } - // yell << _TSEPSC << endl; - // } - //! --- Initialize dimension bin counter unsigned int NDimBins[NDim]; NDimBins[0] = fnlo->GetNDim0Bins();