Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xscape 1.1.4 rc #37

Merged
merged 5 commits into from
Sep 19, 2024
Merged

Xscape 1.1.4 rc #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f600753
update version num in README & workflows to 1.1.4
latessa Sep 16, 2024
3d02b5b
Fix bug when not decaying hadrons Hybrid Hadronization (Pythia)
latessa Sep 19, 2024
1c09483
Fix infinite loop when input for SMASH is empty
latessa Sep 19, 2024
8637288
Merge pull request #35 from JETSCAPE/fix_empty_SMASH_infinite_loop
latessa Sep 19, 2024
369570b
Merge pull request #36 from JETSCAPE/fix_HH_bug_decays
latessa Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/plot_observables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- main
- XSCAPE-1.1.3-RC
- XSCAPE-1.1.4-RC

env:
PULL_NUMBER: ${{ github.event.number }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/smash_test_completes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-build-external.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-PbPb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-Pythia-Isr-Dat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-Pythia-Isr-Hadron.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-Pythia-Isr-Parton.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-brick.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-events-pp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 5 additions & 1 deletion src/afterburner/SmashWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
}
Expand Down
4 changes: 4 additions & 0 deletions src/hadronization/HybridHadronization.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down