Merge pull request #4 from JETSCAPE/XSCAPE-1.1-RC

Xscape 1.1 rc
JETSCAPE · Nov 21, 2023 · bcd0078 · bcd0078
2 parents 36b2259 + 24de4c2
commit bcd0078
Show file tree

Hide file tree

Showing 75 changed files with 12,757 additions and 6,607 deletions.
diff --git a/.github/workflows/smash_test_completes.yaml b/.github/workflows/smash_test_completes.yaml
@@ -0,0 +1,67 @@
+name: smash test completes
+
+on:
+  pull_request:
+    branches:
+      - main
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
+
+  push:
+    branches:
+      - main
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
+
+env:
+  REPO_NAME: ${{ github.event.repository.name }}
+
+jobs:
+  build:
+    name: build for smash test
+    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 MUSIC
+      run: |
+        cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
+        ./get_music.sh
+
+    - name: Download ISS
+      run: |
+        cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
+        ./get_iSS.sh
+
+    - name: Download FREESTREAM
+      run: |
+        cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
+        ./get_freestream-milne.sh
+
+    - name: Download SMASH
+      run: |
+        cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
+        ./get_smash.sh
+
+    - name: Build Application
+      run: |
+        cd ${GITHUB_WORKSPACE}/${REPO_NAME}
+        mkdir build
+        cd build
+        export SMASH_DIR="${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages/smash/smash_code"
+        cmake .. -DUSE_MUSIC=ON -DUSE_ISS=ON -DUSE_FREESTREAM=ON -DUSE_SMASH=ON
+        make -j6
+
+    - name: Run Application
+      run: |
+        cd ${GITHUB_WORKSPACE}/${REPO_NAME}/build
+        ./runJetscape ../config/jetscape_user_test_smash_RC1_1.xml
diff --git a/.github/workflows/test-build-external.yaml b/.github/workflows/test-build-external.yaml
@@ -4,14 +4,14 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
   push:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: jetscape/base:v1.8
+      image: jetscape/base:stable
       options: --user root
 
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: ${{ github.event.repository.name }}
 
@@ -52,11 +52,16 @@ jobs:
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
         ./get_smash.sh
 
+    - name: Download 3DGlauber
+      run: |
+        cd ${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages
+        ./get_3dglauber.sh
+
     - name: Build Application
       run: |
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}
         mkdir build
         cd build
         export SMASH_DIR="${GITHUB_WORKSPACE}/${REPO_NAME}/external_packages/smash/smash_code"
-        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_MUSIC=ON -DUSE_ISS=ON -DUSE_FREESTREAM=ON -DUSE_SMASH=ON
+        cmake .. -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON -DUSE_FREESTREAM=ON -DUSE_SMASH=ON
         make -j2
diff --git a/.github/workflows/test-events-PbPb.yaml b/.github/workflows/test-events-PbPb.yaml
@@ -4,14 +4,14 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
   push:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: jetscape/base:v1.8
+      image: jetscape/base:stable
       options: --user root
 
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: ${{ github.event.repository.name }}
 
@@ -37,11 +37,11 @@ jobs:
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}
         mkdir build
         cd build
-        cmake .. -DCMAKE_CXX_STANDARD=14
+        cmake ..
         make -j2
 
     - name: Checkout TEST-EXAMPLES
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: JETSCAPE/TEST-EXAMPLES
         path: TEST-EXAMPLES

diff --git a/.github/workflows/test-events-Pythia-Isr-Dat.yaml b/.github/workflows/test-events-Pythia-Isr-Dat.yaml
@@ -1,17 +1,19 @@
 name: build+regression test Pythia-ISR Dat Output
 
 on:
+  workflow_dispatch:
+
   pull_request:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
   push:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +24,13 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: jetscape/base:v1.8
+      image: jetscape/base:stable
       options: --user root
 
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: ${{ github.event.repository.name }}
 
@@ -44,11 +46,11 @@ jobs:
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}
         mkdir build
         cd build
-        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
+        cmake .. -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
         make -j2
 
     - name: Checkout TEST-EXAMPLES
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: JETSCAPE/TEST-EXAMPLES
         path: TEST-EXAMPLES

diff --git a/.github/workflows/test-events-Pythia-Isr-Hadron.yaml b/.github/workflows/test-events-Pythia-Isr-Hadron.yaml
@@ -4,14 +4,14 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
   push:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: jetscape/base:v1.8
+      image: jetscape/base:stable
       options: --user root
 
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: ${{ github.event.repository.name }}
 
@@ -44,11 +44,11 @@ jobs:
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}
         mkdir build
         cd build
-        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
+        cmake .. -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
         make -j2
 
     - name: Checkout TEST-EXAMPLES
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: JETSCAPE/TEST-EXAMPLES
         path: TEST-EXAMPLES

diff --git a/.github/workflows/test-events-Pythia-Isr-Parton.yaml b/.github/workflows/test-events-Pythia-Isr-Parton.yaml
@@ -4,14 +4,14 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
   push:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: jetscape/base:v1.8
+      image: jetscape/base:stable
       options: --user root
 
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: ${{ github.event.repository.name }}
 
@@ -44,11 +44,11 @@ jobs:
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}
         mkdir build
         cd build
-        cmake .. -DCMAKE_CXX_STANDARD=14 -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
+        cmake .. -DUSE_3DGlauber=ON -DUSE_MUSIC=ON -DUSE_ISS=ON
         make -j2
 
     - name: Checkout TEST-EXAMPLES
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: JETSCAPE/TEST-EXAMPLES
         path: TEST-EXAMPLES

diff --git a/.github/workflows/test-events-pp.yaml b/.github/workflows/test-events-pp.yaml
@@ -4,14 +4,14 @@ on:
   pull_request:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
   push:
     branches:
       - main
-      - XSCAPE-RC2
-      - XSCAPE-1.0-for-public-repo
+      - XSCAPE-1.1-RC
+      - XSCAPE-1.1-RC_mergeMUSIC
 
 env:
   REPO_NAME: ${{ github.event.repository.name }}
@@ -22,13 +22,13 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: jetscape/base:v1.8
+      image: jetscape/base:stable
       options: --user root
 
     steps:
 
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         path: ${{ github.event.repository.name }}
 
@@ -37,11 +37,11 @@ jobs:
         cd ${GITHUB_WORKSPACE}/${REPO_NAME}
         mkdir build
         cd build
-        cmake .. -DCMAKE_CXX_STANDARD=14
+        cmake ..
         make -j2
 
     - name: Checkout TEST-EXAMPLES
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: JETSCAPE/TEST-EXAMPLES
         path: TEST-EXAMPLES