Merge branch 'trunk' into BeamInstrumentation

LDMX-Software · Jul 22, 2023 · 4a3e0d1 · 4a3e0d1
2 parents 1d199e0 + 29ccf9a
commit 4a3e0d1
Show file tree

Hide file tree

Showing 81 changed files with 3,168 additions and 913 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,11 +24,7 @@ A clear and concise description of what you want to happen (i.e. instead of the
 If applicable, add screenshots to help explain your problem.
 
 **Environment:**
- - Inside the container:
-    - Output of `ldmx-container-config`
- - Outside the container:
-    - OS of computer you are running on
-    - Version of Geant4, ROOT, ONNXRuntime, Xerces, and gcc
+Output of `ldmx config`:
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/actions/common.sh b/.github/actions/common.sh
@@ -43,7 +43,7 @@ set_output() {
   local _key="$1"
   local _val="$2"
   echo "${_key} = ${_val}"
-  echo "::set-output name=${_key}::${_val}"
+  echo "${_key}=${_val}" >> $GITHUB_OUTPUT
 }
 
 # GitHub workflow command to start an group of output messages

diff --git a/.github/actions/setup/setup.sh b/.github/actions/setup/setup.sh
@@ -15,6 +15,11 @@ set -e
 source ${GITHUB_ACTION_PATH}/../common.sh
 
 __main__() {
+  start_group Pull the Environment
+  docker pull ${LDMX_DOCKER_TAG}
+  docker inspect ${LDMX_DOCKER_TAG}
+  end_group
+
   start_group Configure the Build
   local _build=${LDMX_BASE}/ldmx-sw/build
   mkdir ${_build}

diff --git a/.github/actions/validate/gold_label b/.github/actions/validate/gold_label
@@ -1 +1 @@
-v3.2.0
+v3.2.7
diff --git a/.github/validation_samples/ecal_pn/config.py b/.github/validation_samples/ecal_pn/config.py
@@ -61,5 +61,6 @@
         TrigScintClusterProducer.pad2(),
         TrigScintClusterProducer.pad3(),
         trigScintTrack, 
-        count, TriggerProcessor('trigger')
+        count, TriggerProcessor('trigger'),
+        dqm.PhotoNuclearDQM(verbose=True),
         ] + dqm.all_dqm)
diff --git a/.github/validation_samples/ecal_pn/gold.root b/.github/validation_samples/ecal_pn/gold.root
diff --git a/.github/validation_samples/hcal/gold.root b/.github/validation_samples/hcal/gold.root
diff --git a/.github/validation_samples/inclusive/config.py b/.github/validation_samples/inclusive/config.py
@@ -61,5 +61,6 @@
         TrigScintClusterProducer.pad2(),
         TrigScintClusterProducer.pad3(),
         trigScintTrack,
-        count, TriggerProcessor('trigger')
+        count, TriggerProcessor('trigger'),
+        dqm.PhotoNuclearDQM(verbose=False),
         ] + dqm.all_dqm)
diff --git a/.github/validation_samples/inclusive/gold.root b/.github/validation_samples/inclusive/gold.root
diff --git a/.github/validation_samples/it_pileup/config.py b/.github/validation_samples/it_pileup/config.py
@@ -95,8 +95,11 @@
     trigScintTrack,
     count, TriggerProcessor('trigger'),
     dqm.SimObjects(sim_pass=thisPassName),
-    ecalDigiVerify,dqm.EcalShowerFeatures(), 
-    dqm.HCalDQM()]+dqm.recoil_dqm+dqm.trigger_dqm)
+    ecalDigiVerify,dqm.EcalShowerFeatures(),
+        dqm.PhotoNuclearDQM(verbose=False),
+    dqm.HCalDQM(),
+
+]+dqm.recoil_dqm+dqm.trigger_dqm)
 
 p.inputFiles = ['ecal_pn.root']
 p.outputFiles= ['events.root']

diff --git a/.github/validation_samples/it_pileup/gold.root b/.github/validation_samples/it_pileup/gold.root
diff --git a/.github/workflows/basic_test.yml b/.github/workflows/basic_test.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout ldmx-sw
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 

diff --git a/.github/workflows/build_production_image.yml b/.github/workflows/build_production_image.yml
@@ -25,19 +25,19 @@ jobs:
     steps:
     -
       name: Setup QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
     -
       name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
     -
       name: Login to DockerHub
-      uses: docker/login-action@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
     -
       name: Git Build Context
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: recursive
         ref: ${{ github.event.inputs.branch }}
@@ -77,7 +77,7 @@ jobs:
     -
       name: Build the Image
       id: docker_build
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v3
       with:
         tags: ${{ steps.generate_tag.outputs.tags }}
         push: true

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout ldmx-sw
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 
@@ -29,14 +29,14 @@ jobs:
 
     # Runs doxygen doxygen.conf in the docs/ directory
     - name: Run Doxygen to build C++ Docs
-      uses: mattnotmitt/doxygen-action@v1.1.0
+      uses: mattnotmitt/doxygen-action@v1.9
       with:
         doxyfile-path: doxygen.conf/doxyfile #relative to working directory
         working-directory: docs #docs subdirectory
 
     # sphinx is a python package, so we need to setup python on this runner
     - name: Setup Python for Sphinx
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
 
     # Runs sphinx-apidoc and sphinx-build in the docs/ directory
     #   sphinx-apidoc requires the python files to be packaged together

diff --git a/.github/workflows/generate_pr_gold.yml b/.github/workflows/generate_pr_gold.yml
@@ -16,7 +16,7 @@ jobs:
       job_matrix: ${{steps.gen-mat.outputs.job_matrix}}
     steps:
     - name: Checkout ldmx-sw
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: 'recursive'
 
@@ -27,7 +27,7 @@ jobs:
       run: tar cf ldmx-sw-package.tar install/ .github/
 
     - name: Upload ldmx-sw Package
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ldmx-sw-build-${{ github.sha }}
         path: ldmx-sw-package.tar
@@ -45,7 +45,7 @@ jobs:
       matrix: ${{fromJson(needs.compile-ldmx-sw.outputs.job_matrix)}}
     steps:
     - name: Download ldmx-sw Package
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: ldmx-sw-build-${{ github.sha }}
 
@@ -62,7 +62,7 @@ jobs:
         no_comp: true
 
     - name: Upload New Golden Histograms
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{matrix.sample}}-new-gold
         path: ${{steps.validation.outputs.hists}}
@@ -72,14 +72,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout ldmx-sw
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: 'recursive'
         ref: trunk
 
     - name: Download All the Gold
       id: download
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         path: '../'
 
@@ -116,7 +116,7 @@ jobs:
       shell: bash
 
     - name: Open PR for the New Gold
-      uses: peter-evans/create-pull-request@v3
+      uses: peter-evans/create-pull-request@v4
       with:
         commit-message: 'Updated Gold for release ${{ steps.update-gold.outputs.new-label }}'
         title: 'New Gold for Generated by release ${{ steps.update-gold.outputs.new-label }}'

diff --git a/.github/workflows/new_pre_release.yml b/.github/workflows/new_pre_release.yml
@@ -23,7 +23,7 @@ jobs:
       job_matrix: ${{steps.gen-mat.outputs.job_matrix}}
     steps:
     - name: Checkout ldmx-sw
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: 'recursive'
         ref: ${{ github.event.inputs.branch }}
@@ -35,7 +35,7 @@ jobs:
       run: tar cf ldmx-sw-package.tar install/ .github/
 
     - name: Upload ldmx-sw Package
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ldmx-sw-build-${{ github.sha }}
         path: ldmx-sw-package.tar
@@ -55,7 +55,7 @@ jobs:
       matrix: ${{fromJson(needs.compile-ldmx-sw.outputs.job_matrix)}}
     steps:
     - name: Download ldmx-sw Package
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: ldmx-sw-build-${{ github.sha }}
 
@@ -72,7 +72,7 @@ jobs:
         no_comp: true
 
     - name: Upload Histogram File
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{matrix.sample}}-${{matrix.run}}-hists
         path: ${{steps.validation.outputs.hists}}
@@ -82,7 +82,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download Generated Histograms
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         path: '.'
 

diff --git a/.github/workflows/pr_validation.yml b/.github/workflows/pr_validation.yml
@@ -17,7 +17,7 @@ jobs:
       job_matrix: ${{steps.gen-mat.outputs.job_matrix}}
     steps:
     - name: Checkout ldmx-sw
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: 'recursive'
         fetch-depth: 0
@@ -33,7 +33,7 @@ jobs:
       run: tar cf ldmx-sw-package.tar install/ .github/
 
     - name: Upload ldmx-sw Package
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ldmx-sw-build-${{ github.sha }}
         path: ldmx-sw-package.tar
@@ -52,7 +52,7 @@ jobs:
       fail-fast: false
     steps:
     - name: Download ldmx-sw Package
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: ldmx-sw-build-${{ github.sha }}
 
@@ -68,7 +68,7 @@ jobs:
         sample: ${{matrix.sample}}
 
     - name: Upload Validation Plots
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{matrix.sample}}-pr-validation
         path: ${{ steps.validation.outputs.plots }}