Skip to content

Commit 95602c3

Browse files
latessalatessa
authored
Merge pull request #14 from JETSCAPE/XSCAPE-1.1.1-RC
Xscape 1.1.1 Release
2 parents bcd0078 + 171c3e5 commit 95602c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+353
-162
lines changed

‎.github/workflows/smash_test_completes.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1-RC
7+
- XSCAPE-1.1.1-RC
88
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-1.1-RC
13+
- XSCAPE-1.1.1-RC
1414
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1-RC
7+
- XSCAPE-1.1.1-RC
88
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-1.1-RC
13+
- XSCAPE-1.1.1-RC
1414
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1-RC
7+
- XSCAPE-1.1.1-RC
88
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-1.1-RC
13+
- XSCAPE-1.1.1-RC
1414
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:
@@ -44,6 +44,7 @@ jobs:
4444
uses: actions/checkout@v4
4545
with:
4646
repository: JETSCAPE/TEST-EXAMPLES
47+
ref: main
4748
path: TEST-EXAMPLES
4849

4950
- name: Run Pb-Pb tests

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ on:
66
pull_request:
77
branches:
88
- main
9-
- XSCAPE-1.1-RC
9+
- XSCAPE-1.1.1-RC
1010
- XSCAPE-1.1-RC_mergeMUSIC
1111

1212
push:
1313
branches:
1414
- main
15-
- XSCAPE-1.1-RC
15+
- XSCAPE-1.1.1-RC
1616
- XSCAPE-1.1-RC_mergeMUSIC
1717

1818
env:
@@ -53,6 +53,7 @@ jobs:
5353
uses: actions/checkout@v4
5454
with:
5555
repository: JETSCAPE/TEST-EXAMPLES
56+
ref: main
5657
path: TEST-EXAMPLES
5758

5859
- name: Run Pythia ISR Dat File Tests

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1-RC
7+
- XSCAPE-1.1.1-RC
88
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-1.1-RC
13+
- XSCAPE-1.1.1-RC
1414
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:
@@ -51,6 +51,7 @@ jobs:
5151
uses: actions/checkout@v4
5252
with:
5353
repository: JETSCAPE/TEST-EXAMPLES
54+
ref: main
5455
path: TEST-EXAMPLES
5556

5657
- name: Run Pythia ISR Hadron File Tests

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1-RC
7+
- XSCAPE-1.1.1-RC
88
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-1.1-RC
13+
- XSCAPE-1.1.1-RC
1414
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:
@@ -51,6 +51,7 @@ jobs:
5151
uses: actions/checkout@v4
5252
with:
5353
repository: JETSCAPE/TEST-EXAMPLES
54+
ref: main
5455
path: TEST-EXAMPLES
5556

5657
- name: Run Pythia ISR Parton File Tests

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- XSCAPE-1.1-RC
7+
- XSCAPE-1.1.1-RC
88
- XSCAPE-1.1-RC_mergeMUSIC
99

1010
push:
1111
branches:
1212
- main
13-
- XSCAPE-1.1-RC
13+
- XSCAPE-1.1.1-RC
1414
- XSCAPE-1.1-RC_mergeMUSIC
1515

1616
env:
@@ -44,6 +44,7 @@ jobs:
4444
uses: actions/checkout@v4
4545
with:
4646
repository: JETSCAPE/TEST-EXAMPLES
47+
ref: main
4748
path: TEST-EXAMPLES
4849

4950
- name: Run pp tests

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# X-SCAPE 1.1
1+
# X-SCAPE 1.1.1
22

33
The X-ion collisions with a Statistically and Computationally Advanced Program Envelope (X-SCAPE) is the enhanced (and 2nd) project of the JETSCAPE
44
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

+21-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<nReuseHydro> 10 </nReuseHydro>
1717

1818
<!-- Technical settings -->
19-
<debug> on </debug>
19+
<debug> off </debug>
2020
<remark> off </remark>
2121
<vlevel> 0 </vlevel>
2222
<nEvents_printout> 100 </nEvents_printout>
@@ -84,7 +84,7 @@
8484

8585
<!-- Options to read initial conditions from saved file -->
8686
<initial_profile_path>../examples/test_hydro_files</initial_profile_path>
87-
87+
<initial_Ncoll_list>../examples/test_hydro_files</initial_Ncoll_list>
8888
<MCGlauber>
8989
<ran_seed_MCGla> -1 </ran_seed_MCGla>
9090
<rapidity_loss_method> 4 </rapidity_loss_method>
@@ -145,12 +145,14 @@
145145
<tStart> 0.6 </tStart> <!-- Start time of jet quenching, proper time, fm/c -->
146146
<mutex>ON</mutex>
147147
<AddLiquefier> false </AddLiquefier>
148+
<lambdaQCD>0.2</lambdaQCD> <!-- 0.4 is the value chosen in JETSET -->
148149

149150
<Matter>
150151
<name>Matter</name>
151152
<matter_on> 1 </matter_on>
152153
<Q0> 2.0 </Q0>
153154
<T0> 0.16 </T0>
155+
<!--if negative vir_factor: parton 3-momentum of hard parton is used to compute initial virtuality in shower; if positive: transverse momentum of parton is used-->
154156
<vir_factor> 0.25 </vir_factor>
155157
<in_vac> 1 </in_vac>
156158
<recoil_on> 0 </recoil_on>
@@ -216,7 +218,9 @@
216218
<Preequilibrium>
217219

218220
<!-- starting long. proper time for Preequilibrium dynamics -->
219-
<tau0>0.1</tau0>
221+
<tau0>0.0</tau0>
222+
<!-- starting long. proper time for Preequilibrium dynamics outuput for hard probes -->
223+
<tauj>0.1</tauj>
220224
<!-- switching long. proper time from Preequilibrium dynamics to Hydrodynamics (Landau Matching) -->
221225
<taus>0.2</taus>
222226

@@ -349,20 +353,30 @@
349353
<JetHadronization>
350354
<name>colored/colorless/hybrid</name>
351355
<take_recoil>1</take_recoil>
352-
<!--eCMforHadronization only for pp collisions-->
353-
<!--in hybrid put the full eCM here, this is distributed to the beam partons-->
356+
<!--use eCMforHadronization only for pp collisions to introduce beam partons-->
357+
<!--recommended value for e+e- and AA = 0-->
358+
<!--in all hadronization modules put the full eCM here, this is distributed to the beam partons (1/6 for each one)-->
354359
<eCMforHadronization>5020</eCMforHadronization>
360+
<!--maximum energy level for mesons-->
355361
<reco_Mlevelmax>1</reco_Mlevelmax>
362+
<!--maximum energy level for baryons-->
356363
<reco_Blevelmax>1</reco_Blevelmax>
364+
<!--switch for recombination of Goldstone bosons-->
357365
<reco_goldstone>0</reco_goldstone>
366+
<!--squared maximum distance for recombination with thermal partons-->
358367
<thermreco_distmax>5.0</thermreco_distmax>
368+
<!--factor for recombination in the shower-->
359369
<shower_recofactor>1.0</shower_recofactor>
370+
<!--factor for recombination with thermal partons-->
360371
<thermal_recofactor>1.0</thermal_recofactor>
372+
<!--switch for recombination biased by the time of the partons-->
361373
<recobias_t>0</recobias_t>
362374
<hydro_Tc>0.16</hydro_Tc>
363375
<eta_max_boost_inv>2.0</eta_max_boost_inv> <!--only relevant for boost invariant hydro, max eta for thermal parton sampler-->
376+
<!--free-straming propagation of hadrons after hadronization-->
364377
<had_postprop>0.0</had_postprop>
365-
<part_prop>1.0</part_prop>
378+
<!--free-streaming of partons before hadronization-->
379+
<part_prop>0.0</part_prop>
366380
<pythia_decays>on</pythia_decays> <!-- lets the particles given to pythia decay-->
367381
<tau0Max>10.0</tau0Max> <!-- only particles with tau0 < tau0Max (given in mm/c) can decay, increase to include weak decays-->
368382
<weak_decays>depracted</weak_decays> <!-- use the parameters pythia_decays and tau0Max, this parameter is only a dummy to make old xml files work-->
@@ -418,7 +432,7 @@
418432
<SMASH_particles_file>../external_packages/smash/smash_code/input/particles.txt</SMASH_particles_file>
419433
<SMASH_decaymodes_file>../external_packages/smash/smash_code/input/decaymodes.txt</SMASH_decaymodes_file>
420434
<!-- time in fm/c in the computational frame, when the simulation shoud be ended -->
421-
<end_time>300.0</end_time>
435+
<end_time>1000.0</end_time>
422436
<!-- 0 - run the full afterburner, 1 - only decay the resonances without even propagation -->
423437
<only_decays>0</only_decays>
424438
</SMASH>

‎config/jetscape_user_sims.xml

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<?xml version="1.0"?>
2+
3+
<jetscape>
4+
5+
<vlevel> 0 </vlevel>
6+
<nEvents> 1 </nEvents>
7+
8+
9+
<setReuseHydro> false </setReuseHydro>
10+
<nReuseHydro> 1 </nReuseHydro>
11+
12+
<Random>
13+
<seed>0</seed>
14+
</Random>
15+
16+
<outputFilename>event</outputFilename>
17+
<JetScapeWriterAscii> on </JetScapeWriterAscii>
18+
<JetScapeWriterAsciiGZ> off </JetScapeWriterAsciiGZ>
19+
<write_pthat> 1 </write_pthat>
20+
21+
<!-- Inital State Module -->
22+
<IS>
23+
<grid_max_x> 15 </grid_max_x>
24+
<grid_max_y> 15 </grid_max_y>
25+
<grid_max_z> 0 </grid_max_z>
26+
<!-- <grid_step_x> 0.2 </grid_step_x>
27+
<grid_step_y> 0.2 </grid_step_y> -->
28+
<grid_step_x> 0.2 </grid_step_x>
29+
<grid_step_y> 0.2 </grid_step_y>
30+
31+
<Trento>
32+
<PhysicsInputs projectile='Au'
33+
target='Au'
34+
sqrts='200'
35+
cross-section='4.2'
36+
normalization='5.73'>
37+
</PhysicsInputs>
38+
<CutInputs
39+
centrality-low='0'
40+
centrality-high='5'>
41+
</CutInputs>
42+
<TransInputs reduced-thickness='0.063'
43+
fluctuation="1.05"
44+
nucleon-width="1.12"
45+
nucleon-min-dist="1.4">
46+
</TransInputs>
47+
<LongiInputs mean-coeff="1.0"
48+
std-coeff="3.0"
49+
skew-coeff="0.0"
50+
skew-type="1"
51+
jacobian="0.8">
52+
</LongiInputs>
53+
</Trento>
54+
</IS>
55+
56+
<!--Preequilibrium Dynamics Module -->
57+
<Preequilibrium>
58+
<!-- starting long. proper time for Preequilibrium dynamics -->
59+
<tau0>0.0</tau0>
60+
<tauj>0.1</tauj>
61+
<!-- switching long. proper time from Preequilibrium dynamics to Hydrodynamics (Landau Matching) -->
62+
<taus>1.46</taus>
63+
64+
<!-- Individual Preequilibrium Dynamics models -->
65+
<FreestreamMilne>
66+
<name>FreestreamMilne</name>
67+
<freestream_input_file>freestream_input</freestream_input_file>
68+
</FreestreamMilne>
69+
</Preequilibrium>
70+
71+
<!-- Hydro Module -->
72+
<Hydro>
73+
<MUSIC>
74+
<beastMode>0</beastMode>
75+
<Initial_time_tau_0>1.46</Initial_time_tau_0>
76+
<T_dependent_Shear_to_S_ratio>3</T_dependent_Shear_to_S_ratio>
77+
<eta_over_s_T_kink_in_GeV>0.223</eta_over_s_T_kink_in_GeV>
78+
<eta_over_s_low_T_slope_in_GeV>-0.776</eta_over_s_low_T_slope_in_GeV>
79+
<eta_over_s_high_T_slope_in_GeV>0.37</eta_over_s_high_T_slope_in_GeV>
80+
<eta_over_s_at_kink>0.096</eta_over_s_at_kink>
81+
<temperature_dependent_bulk_viscosity>3</temperature_dependent_bulk_viscosity>
82+
<zeta_over_s_max>0.133</zeta_over_s_max>
83+
<zeta_over_s_T_peak_in_GeV>0.12</zeta_over_s_T_peak_in_GeV>
84+
<zeta_over_s_width_in_GeV>0.072</zeta_over_s_width_in_GeV>
85+
<zeta_over_s_lambda_asymm>-0.122</zeta_over_s_lambda_asymm>
86+
<freezeout_temperature>0.136</freezeout_temperature>
87+
</MUSIC>
88+
</Hydro>
89+
90+
<SoftParticlization>
91+
<iSS>
92+
<!-- file path for the default input file -->
93+
<iSS_input_file>iSS_parameters.dat</iSS_input_file>
94+
<!-- directory path where the hydro surface is stored -->
95+
<iSS_table_path>iSS_tables</iSS_table_path>
96+
<!-- file path for the default particle table files -->
97+
<iSS_particle_table_path>iSS_tables</iSS_particle_table_path>
98+
<afterburner_type>2</afterburner_type>
99+
<number_of_repeated_sampling>100</number_of_repeated_sampling>
100+
<Perform_resonance_decays>0</Perform_resonance_decays>
101+
</iSS>
102+
</SoftParticlization>
103+
104+
<!-- Hadronic Afterburner -->
105+
<Afterburner>
106+
<!-- SMASH -->
107+
<SMASH>
108+
<name>SMASH</name>
109+
</SMASH>
110+
</Afterburner>
111+
112+
</jetscape>

‎examples/test_freestream_files/freestream_input

+9-8
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@ ETA_WIDTH 0.5
66
ETA_FLAT 0.5
77
SIGMA 0.5
88
SIGMA_B 0.5
9-
DIM_X 100
10-
DIM_Y 100
9+
DIM_X 150
10+
DIM_Y 150
1111
DIM_ETA 1
1212
DIM_RAP 1
1313
DIM_PHIP 500
1414
DX 0.2
1515
DY 0.2
1616
DETA 0.1
1717
DRAP 0.07
18-
DTAU 0.5
19-
TAU0 0.1
18+
DTAU 0.7
19+
TAU0 0.0
20+
TAUJ 0.1
2021
NT 10
2122
EOS_TYPE 1
22-
E_FREEZE 0.15
23+
E_FREEZE 1.7
2324
VISCOUS_MATCHING 1
24-
E_DEP_FS 0
25+
E_DEP_FS 1
2526
E_R 4.0
26-
TAU_R 0.4
27-
ALPHA 0.
27+
TAU_R 1.46
28+
ALPHA 0.031

0 commit comments

Comments
 (0)