Merge pull request #37 from JETSCAPE/XSCAPE-1.1.4-RC

Xscape 1.1.4 rc

Author: latessa

.github/workflows/plot_observables.yaml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
 env:
   PULL_NUMBER: ${{ github.event.number }}

.github/workflows/smash_test_completes.yaml

@@ -4,12 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

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

@@ -4,12 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

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

@@ -4,12 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

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

@@ -6,12 +6,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

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

@@ -4,12 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

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

@@ -4,12 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

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

@@ -4,13 +4,13 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
       - brick_matter_lbt
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
       - brick_matter_lbt
 
 env:

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

@@ -4,12 +4,12 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
   push:
     branches:
       - main
-      - XSCAPE-1.1.3-RC
+      - XSCAPE-1.1.4-RC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}

README.md

@@ -1,4 +1,4 @@
-# X-SCAPE 1.1.3
+# X-SCAPE 1.1.4
 
 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.

src/afterburner/SmashWrapper.h

@@ -59,7 +59,11 @@ class AfterburnerModus : public smash::ListModus {
   double initial_conditions(smash::Particles *particles,
                             const smash::ExperimentParameters &) {
     add_JS_hadrons_to_smash_particles(jetscape_hadrons_[event_number_], *particles);
-    backpropagate_to_same_time(*particles);
+    if (particles->size() > 0) {
+      backpropagate_to_same_time(*particles);
+    } else {
+      start_time_ = 0.0;
+    }
     event_number_++;
     return start_time_;
   }

src/hadronization/HybridHadronization.cc

@@ -709,6 +709,10 @@ void HybridHadronization::DoHadronization(vector<vector<shared_ptr<Parton>>>& sh
       } //do this only if there are negative partons, otherwise the baryon recombination would be switched off after the first event without negative partons
     }
     if(HH_shower.num() == 0){
+      th_recofactor = tmp_threco;
+      maxB_level = tmp_maxB_level;
+      reco_hadrons_pythia = tmp_reco_hadrons_pythia;
+      if(pythia_decays == "off"){pythia.readString("HadronLevel:Decay = off"); pythia.init();}
       continue;
     } //attempting to handle events/configurations with 0 partons will result in a crash