Merge pull request #20 from JETSCAPE/XSCAPE-1.1.2-RC

Xscape 1.1.2 rc

Author: latessa

.github/workflows/plot_observables.yaml

@@ -4,8 +4,7 @@ on:
   push:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1.2-RC
 
 env:
   PULL_NUMBER: ${{ github.event.number }}

.github/workflows/smash_test_completes.yaml

@@ -4,14 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

.github/workflows/test-build-external.yaml

@@ -4,14 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

.github/workflows/test-events-PbPb.yaml

@@ -4,14 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

.github/workflows/test-events-Pythia-Isr-Dat.yaml

@@ -6,14 +6,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

.github/workflows/test-events-Pythia-Isr-Hadron.yaml

@@ -4,14 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

.github/workflows/test-events-Pythia-Isr-Parton.yaml

@@ -4,14 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

.github/workflows/test-events-brick.yaml

@@ -0,0 +1,56 @@
+name: build+regression test brick matter lbt
+
+on:
+  pull_request:
+    branches:
+      - main
+      - XSCAPE-1.1.2-RC
+      - brick_matter_lbt
+
+  push:
+    branches:
+      - main
+      - XSCAPE-1.1.2-RC
+      - brick_matter_lbt
+
+env:
+  REPO_NAME: ${{ github.event.repository.name }}
+
+jobs:
+  build:
+    name: brick_matter_lbt
+    runs-on: ubuntu-latest
+
+    container:
+      image: jetscape/base:stable
+      options: --user root
+
+    steps:
+
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+      with:
+        path: ${{ github.event.repository.name }}
+
+    - name: Download Lbt Tables
+      run: |
+        cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
+        ./get_lbtTab.sh
+
+    - name: Build Application
+      run: |
+        cd ${GITHUB_WORKSPACE}/${REPO_NAME}
+        mkdir build
+        cd build
+        cmake ..
+        make -j2
+
+    - name: Checkout TEST-EXAMPLES
+      uses: actions/checkout@v4
+      with:
+        repository: JETSCAPE/TEST-EXAMPLES
+        ref: main
+        path: TEST-EXAMPLES
+
+    - name: Run Brick Matter Lbt tests
+      run: ${GITHUB_WORKSPACE}/TEST-EXAMPLES/test/brick_matter_lbt/runBrickMatterLbtTest.sh -j ${GITHUB_WORKSPACE}/${REPO_NAME} -a ${GITHUB_WORKSPACE}/TEST-EXAMPLES -c ${GITHUB_WORKSPACE}/TEST-EXAMPLES/test/brick_matter_lbt/config/jetscape_user.xml -o ${GITHUB_WORKSPACE}/TEST-EXAMPLES/test/brick_matter_lbt/output/new -r ${GITHUB_WORKSPACE}/TEST-EXAMPLES/test/brick_matter_lbt/output/latest

.github/workflows/test-events-pp.yaml

@@ -4,14 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.1-RC
-      - XSCAPE-1.1-RC_mergeMUSIC
+      - XSCAPE-1.1.2-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

README.md

@@ -1,4 +1,4 @@
-# X-SCAPE 1.1.1
+# X-SCAPE 1.1.2
 
 The X-ion collisions with a Statistically and Computationally Advanced Program Envelope (X-SCAPE) is the enhanced (and 2nd) project of the JETSCAPE
 collaboration which extends the framework to include small systems created in p-A and p-p collisions, lower energy heavy-ion collisions and electron-Ion collisions.

config/jetscape_main.xml

@@ -145,7 +145,6 @@
     <tStart> 0.6 </tStart> <!-- Start time of jet quenching, proper time, fm/c   -->
     <mutex>ON</mutex>
     <AddLiquefier> false </AddLiquefier>
-    <lambdaQCD>0.2</lambdaQCD> <!-- 0.4 is the value chosen in JETSET -->
 
     <Matter>
       <name>Matter</name>

config/jetscape_user_pbpb_grid.xml

@@ -68,7 +68,6 @@
 
     <Matter>
       <name>Matter</name>
-      <useHybridHad>0</useHybridHad>
       <matter_on> 1 </matter_on>
       <Q0> 2.0 </Q0>
       <T0> 0.16 </T0>

src/framework/JetScapeConstants.h

@@ -31,6 +31,9 @@ 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;

src/hadronization/ColorlessHadronization.cc

@@ -110,8 +110,6 @@ 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<double> { 0.0, 1.0 };

src/hadronization/ColorlessHadronization.h

@@ -37,7 +37,6 @@ 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<ColorlessHadronization> reg;

src/hydro/Brick.cc

@@ -82,7 +82,6 @@ void Brick::InitializeHydro(Parameter parameter_list) {
 
 void Brick::EvolveHydro() {
   VERBOSE(8);
-  VERBOSE(3) << "size of sd = " << ini->GetEntropyDensityDistribution().size();
   hydro_status = FINISHED;
 }
 

src/initialstate/epemGun.cc

@@ -140,8 +140,6 @@ void epemGun::InitTask() {
     throw std::runtime_error("Pythia init() failed.");
   }
 
-  Lambda_QCD = GetXMLElementDouble({"Eloss","lambdaQCD"});
-
   // Initialize random number distribution
   ZeroOneDistribution = uniform_real_distribution<double>{0.0, 1.0};
 

src/initialstate/epemGun.h

@@ -31,7 +31,6 @@ 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<epemGun> reg;

src/jet/ISRRotation.cc

@@ -471,7 +471,6 @@ void ISRRotation::AddRemenant(Parton &Out,int label){
   int NHardScatterings = ini->pTHat.size();
   double Pz = (Rem.pz() >=0 ? 1.0:-1.0);
 
-  Lambda_QCD = GetXMLElementDouble({"Eloss","lambdaQCD"});
   Rem.reset_momentum(0.25 * Lambda_QCD, 0.25 * Lambda_QCD,Pz,0.0);
   Rem.set_color(Out.anti_color()); 
   Rem.set_anti_color(Out.color());

src/jet/ISRRotation.h

@@ -62,7 +62,6 @@ class ISRRotation : public JetEnergyLossModule<ISRRotation>
     std::array<double, 2> pT; double LatestPartonNewPz;
     double s0 = 0.2, sP0;
     double TotalMomentumFraction;
-    double Lambda_QCD;
 
     std::string Fpath = "ISR-PT.dat";
     std::ofstream *File;

src/jet/Matter.cc

@@ -142,7 +142,6 @@ 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 "
@@ -1845,14 +1844,8 @@ void Matter::DoEnergyLoss(double deltaT, double time, double Q2,
           VERBOSE(8) << BOLDYELLOW << " p after b & d, E = " << energy
                      << " pz = " << pz << " px = " << px << " py = " << py;
         }
-        else{
-            pOut.push_back(pIn[i]);
-        }
         //pOut.push_back(pIn[i]);
       }
-      else{
-        pOut.push_back(pIn[i]);
-      }
     }
 
   } // particle loop

src/jet/Matter.h

@@ -107,7 +107,6 @@ class Matter : public JetEnergyLossModule<Matter> //, 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};

src/jet/iMATTER.cc

@@ -1568,7 +1568,6 @@ double iMATTER::PDF(int pid, double z, double t){
 double iMATTER::alpha_s(double q2) {
   double a, L2, q24, c_nf;
 
-  Lambda_QCD = GetXMLElementDouble({"Eloss","lambdaQCD"});
   L2 = std::pow(Lambda_QCD, 2);
 
   q24 = q2 / 4.0;

src/jet/iMATTER.h

@@ -122,8 +122,7 @@ class iMATTER : public JetEnergyLossModule<iMATTER>
     int LabelOfTheShower, NPartonPerShower = 100000, MAX_COLOR;
     const double z_min_factor = 0.94; // this limits the parent momentum to be P_A/z_min_factor
     double TotalMomentumFraction, TotalMomentum;
-    double Lambda_QCD;
-    
+
     Parton Parent,Sibling,Current;
     int Current_Status = 1e8, Current_Label = -1;
     FourVector RotationVector;