diff --git a/config/jetscape_main.xml b/config/jetscape_main.xml index a8a40016..c474713b 100644 --- a/config/jetscape_main.xml +++ b/config/jetscape_main.xml @@ -145,12 +145,14 @@ 0.6 ON false + 0.2 Matter 1 2.0 0.16 + 0.25 1 0 @@ -351,20 +353,30 @@ colored/colorless/hybrid 1 - - + + + 5020 + 1 + 1 + 0 + 5.0 + 1.0 + 1.0 + 0 0.16 2.0 + 0.0 - 1.0 + + 0.0 on 10.0 depracted diff --git a/src/framework/JetScapeConstants.h b/src/framework/JetScapeConstants.h index 33306282..8f04a76b 100644 --- a/src/framework/JetScapeConstants.h +++ b/src/framework/JetScapeConstants.h @@ -31,9 +31,6 @@ static double Ca = 3.0; static double Nc = 3.0; -static double Lambda_QCD = 0.2; -// 0.4 is the value chosen in JETSET - static const double hbarC = 0.197327053; static const double fmToGeVinv = 1.0 / hbarC; diff --git a/src/hadronization/ColoredHadronization.cc b/src/hadronization/ColoredHadronization.cc index 14a11ff4..b281fb25 100644 --- a/src/hadronization/ColoredHadronization.cc +++ b/src/hadronization/ColoredHadronization.cc @@ -41,7 +41,7 @@ void ColoredHadronization::InitTask() { double p_read_xml = GetXMLElementDouble({"JetHadronization", "eCMforHadronization"}); - p_fake = p_read_xml; + p_fake = p_read_xml / 6.; /*std::string weak_decays = GetXMLElementText({"JetHadronization", "weak_decays"});*/ diff --git a/src/hadronization/ColorlessHadronization.cc b/src/hadronization/ColorlessHadronization.cc index dfa3bb88..47079856 100644 --- a/src/hadronization/ColorlessHadronization.cc +++ b/src/hadronization/ColorlessHadronization.cc @@ -54,7 +54,7 @@ void ColorlessHadronization::InitTask() { // Read sqrts to know remnants energies double p_read_xml = GetXMLElementDouble({"JetHadronization", "eCMforHadronization"}); - p_fake = p_read_xml; + p_fake = p_read_xml / 6.; take_recoil = GetXMLElementInt({"JetHadronization", "take_recoil"}); @@ -110,6 +110,8 @@ void ColorlessHadronization::InitTask() { JSINFO << "Also reading in: " << s; pythia.readString(s); } + + Lambda_QCD = GetXMLElementDouble({"Eloss","lambdaQCD"}); // Initialize random number distribution ZeroOneDistribution = std::uniform_real_distribution { 0.0, 1.0 }; diff --git a/src/hadronization/ColorlessHadronization.h b/src/hadronization/ColorlessHadronization.h index 92587914..35ea5a41 100644 --- a/src/hadronization/ColorlessHadronization.h +++ b/src/hadronization/ColorlessHadronization.h @@ -37,6 +37,7 @@ class ColorlessHadronization private: double p_fake; bool take_recoil; + double Lambda_QCD; // Allows the registration of the module so that it is available to be used by the Jetscape framework. static RegisterJetScapeModule reg; diff --git a/src/hadronization/ThermPtnSampler.cc b/src/hadronization/ThermPtnSampler.cc index 8b6fc4a5..f017b27e 100644 --- a/src/hadronization/ThermPtnSampler.cc +++ b/src/hadronization/ThermPtnSampler.cc @@ -1106,6 +1106,8 @@ void ThermalPartonSampler::sample_2p1d(double eta_max){ // Sample rest frame momentum given T and mass of light quark MCSampler(TRead, 1); // NewP=P, NewX=Px, ... + Vel[1] /= cosh(eta_slice); + Vel[2] /= cosh(eta_slice); Vel[3] = tanh(eta_slice); double vsquare = Vel[1]*Vel[1] + Vel[2]*Vel[2] + Vel[3]*Vel[3]; if(vsquare < 10e-16){ @@ -1206,6 +1208,8 @@ void ThermalPartonSampler::sample_2p1d(double eta_max){ // Sample rest frame momentum given T and mass of s quark MCSampler(TRead, 2); // NewP=P, NewX=Px, ... + Vel[1] /= cosh(eta_slice); + Vel[2] /= cosh(eta_slice); Vel[3] = tanh(eta_slice); double vsquare = Vel[1]*Vel[1] + Vel[2]*Vel[2] + Vel[3]*Vel[3]; if(vsquare < 10e-16){ diff --git a/src/initialstate/epemGun.cc b/src/initialstate/epemGun.cc index a2ff5a57..24c29c4b 100644 --- a/src/initialstate/epemGun.cc +++ b/src/initialstate/epemGun.cc @@ -140,6 +140,8 @@ void epemGun::InitTask() { throw std::runtime_error("Pythia init() failed."); } + Lambda_QCD = GetXMLElementDouble({"Eloss","lambdaQCD"}); + // Initialize random number distribution ZeroOneDistribution = uniform_real_distribution{0.0, 1.0}; diff --git a/src/initialstate/epemGun.h b/src/initialstate/epemGun.h index 2f75758c..e682d27e 100644 --- a/src/initialstate/epemGun.h +++ b/src/initialstate/epemGun.h @@ -31,6 +31,7 @@ class epemGun : public HardProcess, public Pythia8::Pythia { //double pTHatMax; double eCM; //bool FSR_on; + double Lambda_QCD; // Allows the registration of the module so that it is available to be used by the Jetscape framework. static RegisterJetScapeModule reg; diff --git a/src/jet/Matter.cc b/src/jet/Matter.cc index 8eecb215..f8f195c2 100644 --- a/src/jet/Matter.cc +++ b/src/jet/Matter.cc @@ -142,6 +142,7 @@ void Matter::InitTask() { hydro_Tc = GetXMLElementDouble({"Eloss", "Matter", "hydro_Tc"}); brick_length = GetXMLElementDouble({"Eloss", "Matter", "brick_length"}); vir_factor = GetXMLElementDouble({"Eloss", "Matter", "vir_factor"}); + Lambda_QCD = GetXMLElementDouble({"Eloss","lambdaQCD"}); if (vir_factor < 0.0) { cout << "Reminder: negative vir_factor is set, initial energy will be used " diff --git a/src/jet/Matter.h b/src/jet/Matter.h index a0672f42..3b37cd2e 100644 --- a/src/jet/Matter.h +++ b/src/jet/Matter.h @@ -107,6 +107,7 @@ class Matter : public JetEnergyLossModule //, public std::enable_shared_ double initR0, initRx, initRy, initRz, initVx, initVy, initVz, initRdotV, initVdotV, initEner; double Q00, Q0, T0; + double Lambda_QCD; static const int dimQhatTab = 151; double qhatTab1D[dimQhatTab] = {0.0};