Merge pull request #100 from JETSCAPE/XSCAPE-RC2

Xscape rc2
JETSCAPE · Mar 8, 2023 · 759c176 · 759c176
2 parents f48d661 + 7d17032
commit 759c176
Show file tree

Hide file tree

Showing 29 changed files with 703 additions and 140 deletions.
diff --git a/.github/workflows/plot_observables.yaml b/.github/workflows/plot_observables.yaml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo 
 
 env:

diff --git a/.github/workflows/test-build-external.yaml b/.github/workflows/test-build-external.yaml
@@ -4,11 +4,14 @@ on:
   pull_request:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo
+      - XSCAPE-RC2
 
   push:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo 
 
 env:

diff --git a/.github/workflows/test-events-PbPb.yaml b/.github/workflows/test-events-PbPb.yaml
@@ -4,11 +4,14 @@ on:
   pull_request:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo
+      - XSCAPE-RC2
 
   push:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo 
 
 env:

diff --git a/.github/workflows/test-events-Pythia-Isr-Dat.yaml b/.github/workflows/test-events-Pythia-Isr-Dat.yaml
@@ -4,11 +4,14 @@ on:
   pull_request:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo
+      - XSCAPE-RC2
 
   push:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo 
 
 env:
@@ -30,17 +33,19 @@ jobs:
       with:
         path: ${{ github.event.repository.name }}
 
-    - name: Download 3DGlouber
+    - name: Download 3DGlauber
       run: |
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
         ./get_3dglauber.sh
+        ./get_music.sh
+        ./get_iSS.sh
 
     - name: Build Application
       run: |
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}
         mkdir build
         cd build
-        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON
+        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
         make -j2
 
     - name: Checkout TEST-EXAMPLES

diff --git a/.github/workflows/test-events-Pythia-Isr-Hadron.yaml b/.github/workflows/test-events-Pythia-Isr-Hadron.yaml
@@ -4,11 +4,14 @@ on:
   pull_request:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo
+      - XSCAPE-RC2
 
   push:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo 
 
 env:
@@ -30,17 +33,19 @@ jobs:
       with:
         path: ${{ github.event.repository.name }}
 
-    - name: Download 3DGlouber
+    - name: Download 3DGlauber
       run: |
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
         ./get_3dglauber.sh
+        ./get_music.sh
+        ./get_iSS.sh
 
     - name: Build Application
       run: |
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}
         mkdir build
         cd build
-        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON
+        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
         make -j2
 
     - name: Checkout TEST-EXAMPLES

diff --git a/.github/workflows/test-events-Pythia-Isr-Parton.yaml b/.github/workflows/test-events-Pythia-Isr-Parton.yaml
@@ -4,11 +4,14 @@ on:
   pull_request:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo
+      - XSCAPE-RC2
 
   push:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo
 
 env:
@@ -30,17 +33,19 @@ jobs:
       with:
         path: ${{ github.event.repository.name }}
 
-    - name: Download 3DGlouber
+    - name: Download 3DGlauber
       run: |
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
         ./get_3dglauber.sh
+        ./get_music.sh
+        ./get_iSS.sh
 
     - name: Build Application
       run: |
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}
         mkdir build
         cd build
-        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON
+        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
         make -j2
 
     - name: Checkout TEST-EXAMPLES

diff --git a/.github/workflows/test-events-pp.yaml b/.github/workflows/test-events-pp.yaml
@@ -4,11 +4,14 @@ on:
   pull_request:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo
+      - XSCAPE-RC2
 
   push:
     branches:
       - main
+      - XSCAPE-RC2
       - XSCAPE-0.9.1-for-public-repo 
 
 env:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -104,10 +104,10 @@ endif (USE_SMASH)
 message("Compiler and Linker flags ...")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pipe -Wall -std=c++11")
 ## can turn off some warnings
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder -Wno-unused-variable -Wno-deprecated-copy -Wno-unused-value")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder -Wno-unused-variable -Wno-inconsistent-missing-override -Wno-unused-private-field")
 ## Then set the build type specific options. These will be automatically appended.
 set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -w")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 
 ## can turn on debugging information
 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
@@ -117,7 +117,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -w")
 if (APPLE)
     message( STATUS "Apple : " ${CMAKE_HOST_SYSTEM})
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-inconsistent-missing-override -Wno-unused-private-field -Wno-delete-non-abstract-non-virtual-dtor")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++" )
     elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-unused-but-set-variable -Wno-parentheses -fext-numeric-literals")
     endif()
@@ -310,6 +310,7 @@ if (USE_ROOT)
   if (${ROOT_FOUND})
     #include_directories(${ROOT_INCLUDES})
     include_directories(${ROOT_INCLUDE_DIRS})
+    set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -DUSE_ROOT" )
     Message(STATUS "ROOT Include dir : " ${ROOT_INCLUDE_DIRS})
     Message(STATUS "ROOT Libraries : " ${ROOT_LIBRARIES})
   endif()
@@ -348,6 +349,12 @@ include_directories(./external_packages/gtl/include )
 include_directories(./external_packages/hydro_from_external_file )
 include_directories(./examples/ )
 
+if (USE_ROOT)
+  if ("${ROOT_FOUND}")
+    include_directories(./src/root)
+    #add_subdirectory(./src/root)
+  endif()
+endif(USE_ROOT)
 
 ### include_directories will be expanded as packages are found
 
@@ -432,13 +439,6 @@ if (OPENCL_FOUND AND USE_CLVISC)
   add_subdirectory( ${CMAKE_SOURCE_DIR}/external_packages/clvisc_wrapper )
 endif (OPENCL_FOUND AND USE_CLVISC)
 
-if (USE_ROOT)
-  if (${ROOT_FOUND})
-          include_directories(./src/root)
-          add_subdirectory(./src/root)
-  endif()
-endif(USE_ROOT)
-
 ###########################
 ### Binary location     ###
 ###########################
@@ -477,20 +477,25 @@ target_link_libraries(FinalStateHadrons JetScape )
 add_executable(FinalStatePartons ./examples/FinalStatePartons.cc)
 target_link_libraries(FinalStatePartons JetScape )
 
-if(USE_3DGlauber)
+add_executable(PythiaBrickTest ./examples/custom_examples/PythiaBrickTest.cc)
+target_link_libraries(PythiaBrickTest JetScape )
+
+if(USE_3DGlauber AND USE_MUSIC AND USE_ISS)
   add_executable(PythiaIsrTest ./examples/PythiaIsrTest.cc)
   target_link_libraries(PythiaIsrTest JetScape )
-endif (USE_3DGlauber )
-
-#add_executable(PythiaBrickTest ./examples/custom_examples/PythiaBrickTest.cc)
-#target_link_libraries(PythiaBrickTest JetScape )
+  add_executable(PythiaIsrMUSIC ./examples/custom_examples/PythiaIsrMUSIC.cc)
+  target_link_libraries(PythiaIsrMUSIC JetScape )
+endif (USE_3DGlauber AND USE_MUSIC AND USE_ISS )
 
 #add_executable(PythiaBDMTest ./examples/custom_examples/PythiaBDMTest.cc)
 #target_link_libraries(PythiaBDMTest JetScape )
 
 #add_executable(PythiaNoBDMTest ./examples/custom_examples/PythiaNoBDMTest.cc)
 #target_link_libraries(PythiaNoBDMTest JetScape )
 
+#add_executable(PythiaBDMTest_Hydro_Cascade ./examples/custom_examples/PythiaBDMTest_Hydro_Cascade.cc)
+#target_link_libraries(PythiaBDMTest_Hydro_Cascade JetScape )
+
 if ( USE_SMASH )
     add_executable(SMASHTest ./examples/custom_examples/SMASHTest.cc)
     target_link_libraries(SMASHTest JetScape )
@@ -515,10 +520,10 @@ if ( USE_MUSIC AND USE_ISS AND USE_SMASH )
 endif ( USE_MUSIC AND USE_ISS AND USE_SMASH )
 
 if (USE_ROOT)
-  if (${ROOT_FOUND})
-    add_executable(PythiaBrickTestRoot ./examples/custom_examples/PythiaBrickTestRoot.cc)
-    target_link_libraries(PythiaBrickTestRoot JetScape JetScapeRoot)
-  endif(${ROOT_FOUND})
+  #if (${ROOT_FOUND})
+  #  add_executable(PythiaBrickTestRoot ./examples/custom_examples/PythiaBrickTestRoot.cc)
+  #  target_link_libraries(PythiaBrickTestRoot JetScape)
+  #endif(${ROOT_FOUND})
 endif(USE_ROOT)
 
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# X-SCAPE 0.9.1
+# X-SCAPE 1.0
 
 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.
@@ -130,11 +130,14 @@ To compile the 3DGlauber code together with the JETSCAPE framework, please turn
     cmake -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON ..
     make -j4
 ```
+
+For more details see [3DGlauber](https://github.com/JETSCAPE/X-SCAPE/wiki/3DGlauber,-MUSIC,-iSS-and-Initial-State-Radiation).
+
 ### Initial State Shower using iMatter
 
 To use the ISR shower of iMatter, please make sure that the environment variable `$PYTHIA8` is set and points to the directory where pythia8 is installed which can be found using `pythia8-config --prefix`. If you use the JETSCAPE docker container (v1.8), all environment variables, including the `$PYTHIA8` for iMatter are set properly.
 
-After using 3DGlauber support to compile JETSCAPE, one can use `./PythiaIsrTest` (in the build directory) to run iMatter and 3DGlauber which uses the xml user file `config/jetscape_user_iMATTERMCGlauber.xml`
+After using 3DGlauber support to compile JETSCAPE, one can use `./PythiaIsrTest` (in the build directory) to run iMatter and 3DGlauber which uses the xml user file `config/jetscape_user_iMATTERMCGlauber.xml`. For running 3DGlauber with Hydro (Music) please see [3DGlauber](https://github.com/JETSCAPE/X-SCAPE/wiki/3DGlauber,-MUSIC,-iSS-and-Initial-State-Radiation).
 
 
 ## JETSCAPE modules

diff --git a/config/jetscape_main.xml b/config/jetscape_main.xml
@@ -27,6 +27,7 @@
   <JetScapeWriterAscii> off </JetScapeWriterAscii>
   <JetScapeWriterAsciiGZ> off </JetScapeWriterAsciiGZ>
   <JetScapeWriterHepMC> off </JetScapeWriterHepMC>
+  <JetScapeWriterRootHepMC> off </JetScapeWriterRootHepMC>
   <JetScapeWriterFinalStatePartonsAscii> off </JetScapeWriterFinalStatePartonsAscii>
   <JetScapeWriterFinalStateHadronsAscii> off </JetScapeWriterFinalStateHadronsAscii>
   <write_pthat> 0 </write_pthat>
@@ -83,6 +84,17 @@
 
     <!-- Options to read initial conditions from saved file  -->
     <initial_profile_path>../examples/test_hydro_files</initial_profile_path>
+
+    <MCGlauber> 
+        <ran_seed_MCGla> -1 </ran_seed_MCGla>
+        <rapidity_loss_method> 4 </rapidity_loss_method>
+        <ylossParam4At2> 1.666 </ylossParam4At2>
+        <ylossParam4At4> 2.10 </ylossParam4At4>
+        <ylossParam4At6> 21.20 </ylossParam4At6>
+        <ylossParam4At10> 2.30 </ylossParam4At10>
+        <ylossParam4var> 0.555 </ylossParam4var>
+        <remnant_energy_loss_fraction> 0.5 </remnant_energy_loss_fraction>
+    </MCGlauber>
   </IS>
 
   <!-- Hard Process -->
@@ -206,7 +218,7 @@
     </FreestreamMilne>
 
     <NullPreDynamics> </NullPreDynamics>
-    
+
   </Preequilibrium>
 
 
@@ -259,22 +271,27 @@
     <MUSIC>
       <name>MUSIC</name>
       <MUSIC_input_file>music_input</MUSIC_input_file>
+      <InitialProfile>13</InitialProfile>
+      <beastMode>0</beastMode>
       <Initial_time_tau_0>0.5</Initial_time_tau_0>
-      <output_evolution_to_file>1</output_evolution_to_file>
+      <output_evolution_to_file>0</output_evolution_to_file>
+      <store_hydro_info_in_memory>0</store_hydro_info_in_memory>
       <shear_viscosity_eta_over_s>0.08</shear_viscosity_eta_over_s>
-      <T_dependent_Shear_to_S_ratio>0</T_dependent_Shear_to_S_ratio>
-      <eta_over_s_T_kink_in_GeV>0.16</eta_over_s_T_kink_in_GeV>
-      <eta_over_s_low_T_slope_in_GeV>0.</eta_over_s_low_T_slope_in_GeV>
-      <eta_over_s_high_T_slope_in_GeV>0.</eta_over_s_high_T_slope_in_GeV>
-      <eta_over_s_at_kink>0.08</eta_over_s_at_kink>
-      <temperature_dependent_bulk_viscosity>0</temperature_dependent_bulk_viscosity>
-      <zeta_over_s_max>0</zeta_over_s_max>
-      <zeta_over_s_T_peak_in_GeV>0.18</zeta_over_s_T_peak_in_GeV>
+      <T_dependent_Shear_to_S_ratio>3</T_dependent_Shear_to_S_ratio>
+      <shear_viscosity_3_at_kink>0.16</shear_viscosity_3_at_kink>
+      <shear_viscosity_3_low_T_slope_in_GeV>0</shear_viscosity_3_low_T_slope_in_GeV>
+      <shear_viscosity_3_high_T_slope_in_GeV>0</shear_viscosity_3_high_T_slope_in_GeV>
+      <temperature_dependent_bulk_viscosity>3</temperature_dependent_bulk_viscosity>
+      <bulk_viscosity_3_max>0.06</bulk_viscosity_3_max>
+      <zeta_over_s_T_peak_in_GeV>0.17</zeta_over_s_T_peak_in_GeV>
       <zeta_over_s_width_in_GeV>0.02</zeta_over_s_width_in_GeV>
-      <zeta_over_s_lambda_asymm>0.0</zeta_over_s_lambda_asymm>
+      <zeta_over_s_lambda_asymm>0.1</zeta_over_s_lambda_asymm>
       <Include_second_order_terms>1</Include_second_order_terms>
-      <freezeout_temperature>-1</freezeout_temperature>
+      <freezeout_temperature>0.3</freezeout_temperature>
       <Perform_CooperFrye_Feezeout>0</Perform_CooperFrye_Feezeout>
+      <string_source_sigma_x>0.5</string_source_sigma_x>
+      <string_source_sigma_eta>0.5</string_source_sigma_eta>
+      <stringPreEqFlowFactor>0.13</stringPreEqFlowFactor>
     </MUSIC>
 
     <!-- CLVisc  -->
@@ -365,3 +382,4 @@
     </SMASH>
   </Afterburner>
 </jetscape>
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
           - main
+          - XSCAPE-RC2
           - XSCAPE-0.9.1-for-public-repo
     env:
@@ Expand Down @@