Merge branch 'star-bnl:main' into main

star-bnl · May 26, 2023 · 0ec3530 · 0ec3530
2 parents d7f8619 + 84e8230
commit 0ec3530
Show file tree

Hide file tree

Showing 553 changed files with 34,552 additions and 8,452 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -3,6 +3,7 @@
 /OnlTools                                          @plexoos           @jml985
 /StDb                                              @dmarkh
 /StDb/idl                                          @akioogawa         @dmarkh      @fgeurts     @iraklic     @fisyak
+/StRoot/PWGTools				   @nigmatkulov	      @zsweger	   @marrbnl
 /StRoot/RTS                                        @akioogawa         @jml985      @tonko-lj
 /StRoot/StAnalysisMaker                            @fisyak
 /StRoot/StAnalysisUtilities/StHistUtil*            @genevb
@@ -46,6 +47,7 @@
 /StRoot/StETof*                                    @PhilippWeidenkaff @ideppner    @YannickSoehngen
 /StRoot/StEmc*                                     @kkauder           @rkunnawa    @Navagyan    @zlchang
 /StRoot/StEmbeddingUtilities                       @zhux97
+/StRoot/StEpd*					   @Femtoscopist
 /StRoot/StEvent*                                   @klendathu2k
 /StRoot/StEvent/StTpc*                             @fisyak
 /StRoot/StEventUtilities/StEbyET0*                 @genevb
@@ -57,6 +59,7 @@
 /StRoot/StFpd*                                     @akioogawa
 /StRoot/StFst*                                     @jdbrice           @sunxuhit    @yezhenyu2003   @techuan-huang
 /StRoot/StFtt*                                     @jdbrice
+/StRoot/StFwd*					   @jdbrice
 /StRoot/StGenericVertexMaker                       @plexoos           @perevbnlgov @akioogawa   @klendathu2k @fisyak
 /StRoot/StHbtMaker                                 @JohnTheBlindMilkman            @DanielWielanek
 /StRoot/StHeavyPool                                @starsdong         @fgeurts
@@ -70,14 +73,15 @@
 /StRoot/StMc*                                      @klendathu2k       @perevbnlgov
 /StRoot/StMcAnalysisMaker                          @klendathu2k
 /StRoot/StMcEvent*                                 @klendathu2k
+/StRoot/StMiniMc*				   @klendathu2k	      @fisyak	   @zhux97
 /StRoot/StMtd*                                     @marrbnl
 /StRoot/StMuDSTMaker                               @jdbrice
 /StRoot/StMuDSTMaker/EMC                           @kkauder           @rkunnawa    @Navagyan
 /StRoot/StMuDSTMaker/RICHTOF                       @fgeurts           @starsdong
 /StRoot/StPass0CalibMaker                          @genevb            @iraklic
 /StRoot/StPico*                                    @nigmatkulov       @marrbnl     @plexoos
 /StRoot/StPxl*                                     @starsdong         @GuannanXie
-/StRoot/StRefMultCorr                              @nigmatkulov       @zsweger
+/StRoot/StRHICf*				   @ggfdsa10
 /StRoot/StRTSClient                                @jml985            @tonko-lj
 /StRoot/StShadowMaker                              @genevb
 /StRoot/StSpinPool                                 @akioogawa         @zlchang     @veprbl
@@ -91,7 +95,7 @@
 /StRoot/StTreeMaker                                @perevbnlgov
 /StRoot/StTriggerDataMaker                         @akioogawa
 /StRoot/StTriggerUtilities                         @zlchang           @akioogawa   @jml985
-/StRoot/StTrsMaker                                 @fisyak           @iraklic
+/StRoot/StTrsMaker                                 @fisyak            @iraklic
 /StRoot/StUtilities/StMess*                        @genevb
 /StRoot/StUtilities/StMultiH*                      @genevb
 /StRoot/StVpd*                                     @ZaochenYe         @fgeurts
@@ -125,10 +129,10 @@
 /StarDb/Calibrations                               @genevb
 /StarDb/Calibrations/emc                           @kkauder           @rkunnawa    @Navagyan
 /StarDb/Calibrations/tof                           @ZaochenYe         @fgeurts
-/StarDb/Calibrations/tpc                           @fisyak           @iraklic
+/StarDb/Calibrations/tpc                           @fisyak            @iraklic
 /StarDb/Calibrations/tracker                       @klendathu2k
 /StarDb/Geometry                                   @genevb            @klendathu2k
-/StarDb/Geometry/tpc                               @fisyak           @iraklic
+/StarDb/Geometry/tpc                               @fisyak            @iraklic
 /StarDb/VmcGeometry                                @klendathu2k
 /StarDb/emc                                        @kkauder           @rkunnawa    @Navagyan
 /StarVMC                                           @klendathu2k

diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
@@ -23,6 +23,10 @@ jobs:
         id: branch-name
         uses: tj-actions/branch-names@v6
 
+      - name: Define complete image tag
+        run: |
+          echo "TAG=${{ steps.branch-name.outputs.current_branch || steps.branch-name.outputs.tag }}-${{ env.STARENV }}" >> $GITHUB_ENV
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -40,24 +44,30 @@ jobs:
             starenv=${{ matrix.starenv }}
             compiler=${{ matrix.compiler }}
           load: true
-          tags: ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }}-${{ env.STARENV }}
+          tags: ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }}
 
       - name: Push container image
         run: |
-          docker push ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }}-${{ env.STARENV }}
+          docker push ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }}
 
       - name: Create latest tag for default branch
-        if: ${{ steps.branch-name.outputs.is_default == 'true' && env.STARENV == 'root5-gcc485' }}
+        if: ${{ steps.branch-name.outputs.is_tag == 'false' && steps.branch-name.outputs.is_default == 'true' && env.STARENV == 'root5-gcc485' }}
         run: |
-          docker tag  ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }}-${{ env.STARENV }} ghcr.io/${{ github.repository_owner }}/star-sw:latest
+          docker tag  ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }} ghcr.io/${{ github.repository_owner }}/star-sw:latest
           docker push ghcr.io/${{ github.repository_owner }}/star-sw:latest
 
       - name: Create latest tag for SL* branches
-        if: ${{ steps.branch-name.outputs.is_default == 'false' && env.STARENV == 'root5-gcc485' }}
+        if: ${{ steps.branch-name.outputs.is_tag == 'false' && steps.branch-name.outputs.is_default == 'false' && env.STARENV == 'root5-gcc485' }}
         run: |
-          docker tag  ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }}-${{ env.STARENV }} ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }}
+          docker tag  ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }} ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }}
           docker push ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.current_branch }}
 
+      - name: Create image tag based on pushed tag
+        if: ${{ steps.branch-name.outputs.is_tag == 'true' && env.STARENV == 'root5-gcc485' }}
+        run: |
+          docker tag  ghcr.io/${{ github.repository_owner }}/star-sw:${{ env.TAG }} ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.tag }}
+          docker push ghcr.io/${{ github.repository_owner }}/star-sw:${{ steps.branch-name.outputs.tag }}
+
   build-cleanup:
     runs-on: ubuntu-latest
     needs: build

diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
@@ -7,6 +7,10 @@ on:
       - 'docs/**'
       - '!.github/workflows/**'
 
+concurrency:
+   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+   cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -43,7 +47,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test_id: [10, 11, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, 60, 76, 77, 78, 90, 91, 92, 102, 103, 119, 120, 121, 122, 123]
+        test_id: [10, 11, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, 60, 76, 77, 78, 90, 91, 92, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125]
         compiler: [gcc485, gcc11]
     env:
       STARENV: root5-${{ matrix.compiler }}
@@ -55,7 +59,7 @@ jobs:
           path: /tmp
 
       - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar
-      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v6
+      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7
       - run: |
              TEST_CMD=$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py -c ${{ matrix.test_id }})
              # Workaround https://sft.its.cern.ch/jira/browse/ROOT-7660 in ROOT 5 by checking the output log
@@ -80,7 +84,7 @@ jobs:
           path: /tmp
 
       - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar
-      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v6
+      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7
       - run: |
              TEST_FILE=$(echo "$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py ${{ matrix.test_id }} -a fullpath)" | sed -E 's/\.(daq|fzd)$/.event.root/')
              TEST_CMD="root4star -b -q -l 'StRoot/macros/analysis/doEvents.C(100, \"$TEST_FILE\")'"
@@ -105,7 +109,7 @@ jobs:
           path: /tmp
 
       - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar
-      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v6
+      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7
       - run: |
              TEST_FILE=$(echo "$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py ${{ matrix.test_id }} -a fullpath)" | sed -E 's/\.(daq|fzd)$/.event.root/')
              TEST_CMD="root4star -b -q -l 'StRoot/macros/analysis/find_vertex.C(\"$TEST_FILE\")'"
@@ -129,7 +133,7 @@ jobs:
           path: /tmp
 
       - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar
-      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v6
+      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7
       - run: |
              TEST_CMD=$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py -c ${{ matrix.test_id }})
              docker run --volumes-from star-test-data ghcr.io/star-bnl/star-sw-${{ env.STARENV }} \

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,76 @@
 # Changelog
 
+## SL23a_0 - 2023-01-15
+
+## What's Changed
+
+* ci: Bump starenv to v0.2.3 by @plexoos in  ([#399](https://github.com/star-bnl/star-sw/pull/399))
+* Remove OnlTools/OnlinePlots by @plexoos in  ([#407](https://github.com/star-bnl/star-sw/pull/407))
+* Separate out FCS cluster seed thresholds by @akioogawa in  ([#400](https://github.com/star-bnl/star-sw/pull/400))
+* cons: Use `mysql_config` to set up external dependency for mysql by @plexoos in  ([#402](https://github.com/star-bnl/star-sw/pull/402))
+* cons: Use xml2-config to set up external dependency by @plexoos in  ([#404](https://github.com/star-bnl/star-sw/pull/404))
+* cons: Use pkg-config to set up external dependency on log4cxx by @plexoos in  ([#405](https://github.com/star-bnl/star-sw/pull/405))
+* Assorted updates to StRoot/RTS, including `char *` issue by @jml985 in  ([#406](https://github.com/star-bnl/star-sw/pull/406))
+* Update CODEOWNERS by @JohnTheBlindMilkman in  ([#414](https://github.com/star-bnl/star-sw/pull/414))
+* Add issue template for bug reports by @plexoos in  ([#391](https://github.com/star-bnl/star-sw/pull/391))
+* SpinPool Fcs pi0 finder fixing a crash by @akioogawa in  ([#412](https://github.com/star-bnl/star-sw/pull/412))
+* Bug fix on tower Et calculation for the tower selection before jet finder by @zlchang in  ([#403](https://github.com/star-bnl/star-sw/pull/403))
+* ci: Disable test throwing a `std::bad_alloc` by @plexoos in  ([#420](https://github.com/star-bnl/star-sw/pull/420))
+* ci: Upgrade GitHub actions by @plexoos in  ([#419](https://github.com/star-bnl/star-sw/pull/419))
+* Stargenerator Vertexing Options by @klendathu2k in  ([#408](https://github.com/star-bnl/star-sw/pull/408))
+* Fix copy of eTOF good channel flags to PicoEvent by @PhilippWeidenkaff in  ([#416](https://github.com/star-bnl/star-sw/pull/416))
+* ci: Switch to using specific version (v5) of test data container by @plexoos in  ([#418](https://github.com/star-bnl/star-sw/pull/418))
+* Add scripts to load dependency packages via Environment Modules by @jdbrice in  ([#409](https://github.com/star-bnl/star-sw/pull/409))
+* ci: Add test for FST chain with `st_fwd` stream data by @plexoos in  ([#421](https://github.com/star-bnl/star-sw/pull/421))
+* Encode Geometry Tag w/in DB macros by @klendathu2k in  ([#422](https://github.com/star-bnl/star-sw/pull/422))
+* [root6] Modify StRoot/StBFChain/BFC.C for ROOT6/cling by @klendathu2k in  ([#423](https://github.com/star-bnl/star-sw/pull/423))
+* change for yuri by @jml985 in  ([#429](https://github.com/star-bnl/star-sw/pull/429))
+* Avoid pointer cast to `time_t` from incompatible type by @plexoos in  ([#427](https://github.com/star-bnl/star-sw/pull/427))
+* ci: Enable more tests using star-test-data:v6 by @plexoos in  ([#415](https://github.com/star-bnl/star-sw/pull/415))
+* Fix GCC warning: forbidden conversion to `char*` by @plexoos in  ([#389](https://github.com/star-bnl/star-sw/pull/389))
+* Change TPX gain loading interface from `fTpx->put(... to fTpx->gain_al` by @fisyak in  ([#417](https://github.com/star-bnl/star-sw/pull/417))
+* ci: Delete untagged images after successful build by @plexoos in  ([#430](https://github.com/star-bnl/star-sw/pull/430))
+* docker: Add latest tag to default build configuration by @plexoos in  ([#433](https://github.com/star-bnl/star-sw/pull/433))
+* ci: Turn off CI for certain directories by @plexoos in  ([#434](https://github.com/star-bnl/star-sw/pull/434))
+* new ETOF table requested by Yannick by @dmarkh in  ([#435](https://github.com/star-bnl/star-sw/pull/435))
+* Add .devcontainer for GitHub codespaces by @plexoos in  ([#438](https://github.com/star-bnl/star-sw/pull/438))
+* Set search paths for included files for ROOT C++ interpreter by @plexoos in  ([#441](https://github.com/star-bnl/star-sw/pull/441))
+* [root6] StEvent/StEnumerations.cxx fix by @klendathu2k in  ([#440](https://github.com/star-bnl/star-sw/pull/440))
+* Update to StFcsWaveformFitMaker to use new algorithm by @dkapukchyan in  ([#401](https://github.com/star-bnl/star-sw/pull/401))
+* Add FST raw hits in StEvent and StMuDst by @techuan-huang in  ([#378](https://github.com/star-bnl/star-sw/pull/378))
+* [geometry] Add y2023 first cut and y2022a production geometries by @klendathu2k in  ([#432](https://github.com/star-bnl/star-sw/pull/432))
+* [root6] Set attributes on StrangeMuDstMaker in StBFChain, rather than using interpreter to configure by @klendathu2k in  ([#444](https://github.com/star-bnl/star-sw/pull/444))
+* [root6] Eliminate crash when creating the MuDst by @klendathu2k in  ([#442](https://github.com/star-bnl/star-sw/pull/442))
+* New RHICf table for Seunghwan by @dmarkh in  ([#446](https://github.com/star-bnl/star-sw/pull/446))
+* [root6] Fix undeclared identifier 'chain' in StarDb/AgMLGeometry/Geometry...C macro by @plexoos in  ([#448](https://github.com/star-bnl/star-sw/pull/448))
+* Adding eq4 for StTriggerData by @akioogawa in  ([#450](https://github.com/star-bnl/star-sw/pull/450))
+* build-pull-request.yml: cancel previous workflows by @veprbl in  ([#453](https://github.com/star-bnl/star-sw/pull/453))
+* Minimum viable pentagonal sTGC geometry with misalignment by @jdbrice in  ([#447](https://github.com/star-bnl/star-sw/pull/447))
+* Update to trigger simulator to save intermediate jet patch ADCs and minor cleanup to the jet maker by @zlchang in  ([#424](https://github.com/star-bnl/star-sw/pull/424))
+* build: Treat all warnings as errors by @plexoos in  ([#445](https://github.com/star-bnl/star-sw/pull/445))
+* Remove StBFChain dependence in StarDb/AgMLGeometry/CreateGeometry.h by @klendathu2k in  ([#462](https://github.com/star-bnl/star-sw/pull/462))
+* [root6] Address issues in TTable when interpreted by Cling by @plexoos in  ([#449](https://github.com/star-bnl/star-sw/pull/449))
+* update TpcRS parameters for Run19 AuAu19.6 GeV embedding by @zhux97 in  ([#463](https://github.com/star-bnl/star-sw/pull/463))
+* Revert "Remove StBFChain dependence in StarDb/AgMLGeometry/CreateGeometry.h (#462)" (partially) by @plexoos in  ([#468](https://github.com/star-bnl/star-sw/pull/468))
+* docker: Exit build immediately with non-zero status by @plexoos in  ([#469](https://github.com/star-bnl/star-sw/pull/469))
+* Hide include directive from ROOT5 interpreter by @klendathu2k in  ([#456](https://github.com/star-bnl/star-sw/pull/456))
+* cons: Extend `SKIP_DIRS` to match arbitrary path by @plexoos in  ([#467](https://github.com/star-bnl/star-sw/pull/467))
+* StGenericVertex: Clean up #include statements by @plexoos in  ([#443](https://github.com/star-bnl/star-sw/pull/443))
+* Run XIX-XXII new dE/dx model and calibration by @fisyak in  ([#464](https://github.com/star-bnl/star-sw/pull/464))
+* ci: Improve image tagging by @plexoos in  ([#474](https://github.com/star-bnl/star-sw/pull/474))
+* StFst: Fix GCC 4.8.5 warnings by @plexoos in  ([#472](https://github.com/star-bnl/star-sw/pull/472))
+* ci: Add more tests by @plexoos in  ([#473](https://github.com/star-bnl/star-sw/pull/473))
+* StETofHitMaker: Fix unused variable warnings by @plexoos in  ([#471](https://github.com/star-bnl/star-sw/pull/471))
+* Update clock jump correction, add new method for hit manipulation on counter level by @YannickSoehngen in  ([#457](https://github.com/star-bnl/star-sw/pull/457))
+
+## New Contributors
+
+* @JohnTheBlindMilkman made their first contribution in  ([#414](https://github.com/star-bnl/star-sw/pull/414))
+* @dkapukchyan made their first contribution in  ([#401](https://github.com/star-bnl/star-sw/pull/401))
+
+**Full Changelog**: https://github.com/star-bnl/star-sw/compare/SL22c_0...SL23a_0
+
+
 ## SL22c_0 - 2022-09-09
 
 * ci: Expand tests with 2012, 2021, and 2022 data samples by @plexoos in  ([#371](https://github.com/star-bnl/star-sw/pull/371))

diff --git a/Dockerfile b/Dockerfile
@@ -7,6 +7,8 @@ ARG compiler=gcc485
 
 FROM ghcr.io/star-bnl/star-spack:v0.2.3-${starenv}-${compiler}
 
+ARG compiler
+
 ENV NODEBUG=yes
 ENV STAR=/star-sw
 ENV STAR_LIB=$STAR/.${STAR_HOST_SYS}/LIB
@@ -21,8 +23,12 @@ COPY . ${STAR}
 
 SHELL ["/bin/bash", "-l", "-c"]
 
-RUN cons \
- && find .$STAR_HOST_SYS -name *.o -exec rm '{}' \;
+RUN <<EOF
+	set -e
+	[[ $compiler = "gcc485" ]] && EXTRA_CXXFLAGS="-Werror" || EXTRA_CXXFLAGS=""
+	cons EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS"
+	find .$STAR_HOST_SYS -name *.o -exec rm '{}' \;
+EOF
 
 COPY --chmod=0755 <<-"EOF" /opt/entrypoint.sh
 	#!/bin/bash -l

diff --git a/OnlTools/Jevp/StJevpBuilders/fttBuilder.h b/OnlTools/Jevp/StJevpBuilders/fttBuilder.h
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 
 #include "JevpBuilder.h"
-
 class daqReader;
 
 #include <TH1I.h>
@@ -200,7 +199,6 @@ class VMMHardwareMap {
 class VMMHardwareMap;
 #endif
 
-
 // DAQ RTS format for sTGC data
 class stgc_vmm_t;
 class TF1;