Skip to content

Commit

Permalink
Merge branch 'main' into MatchUpdate-and-EventFlagFix
Browse files Browse the repository at this point in the history
  • Loading branch information
@plexoos
plexoos authored Mar 6, 2024
2 parents a86d3ad + 2ffb8a4 commit b7b6d86
Show file tree
Hide file tree
Showing 824 changed files with 12,192 additions and 30,422 deletions.
71 changes: 36 additions & 35 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
.github/ @plexoos @veprbl
/OnlTools @plexoos @jml985
/StDb @dmarkh
/StDb/idl @akioogawa @dmarkh @fgeurts @iraklic @fisyak
/StRoot/PWGTools @nigmatkulov @zsweger @marrbnl
/StDb/idl @akioogawa @dmarkh @fgeurts @iraklic @fisyak @R-Witt
/StRoot/PWGTools @nigmatkulov @zsweger @marrbnl @lbavinh
/StRoot/RTS @akioogawa @jml985 @tonko-lj
/StRoot/StAnalysisMaker @fisyak
/StRoot/StAnalysisMaker @fisyak @R-Witt @iraklic
/StRoot/StAnalysisUtilities/StHistUtil* @genevb
/StRoot/StAssociationMaker/EMC @kkauder @rkunnawa @Navagyan
/StRoot/StBFChain @genevb @plexoos @klendathu2k @fisyak
/StRoot/StBichsel @fisyak
/StRoot/StBFChain @genevb @plexoos @klendathu2k @fisyak @R-Witt @iraklic
/StRoot/StBichsel @fisyak @R-Witt @iraklic
/StRoot/StBTof* @ZaochenYe @fgeurts @starsdong @jdbrice
/StRoot/StBbcSimulationMaker @akioogawa
/StRoot/StChain @klendathu2k @perevbnlgov @fisyak
/StRoot/StChain @klendathu2k @perevbnlgov @fisyak @R-Witt @iraklic
/StRoot/StDAQMaker @perevbnlgov @akioogawa
/StRoot/StDaqLib @jml985
/StRoot/StDaqLib/EEMC @kkauder @rkunnawa @zlchang
Expand All @@ -25,9 +25,9 @@
/StRoot/StDaqLib/TRG @akioogawa
/StRoot/StDataFilterMaker @genevb
/StRoot/StDb* @dmarkh
/StRoot/StDbUtilities @fisyak
/StRoot/StDbUtilities @fisyak @R-Witt @iraklic
/StRoot/StDbUtilities/StMagUtilities* @genevb
/StRoot/StDetectorDbMaker @dmarkh @fisyak
/StRoot/StDetectorDbMaker @dmarkh @fisyak @R-Witt @iraklic
/StRoot/StDetectorDbMaker/StDetectorDbBeamInfo* @genevb
/StRoot/StDetectorDbMaker/StDetectorDbGridLeak* @genevb
/StRoot/StDetectorDbMaker/StDetectorDbRichScalers* @genevb
Expand All @@ -49,7 +49,7 @@
/StRoot/StEmbeddingUtilities @zhux97
/StRoot/StEpd* @Femtoscopist
/StRoot/StEvent* @klendathu2k
/StRoot/StEvent/StTpc* @fisyak
/StRoot/StEvent/StTpc* @fisyak @R-Witt @iraklic
/StRoot/StEventUtilities/StEbyET0* @genevb
/StRoot/StEventUtilities/StRedoTracks* @genevb
/StRoot/StEventUtilities/StuFixTopoMap* @genevb
Expand All @@ -60,93 +60,94 @@
/StRoot/StFst* @jdbrice @sunxuhit @yezhenyu2003 @techuan-huang
/StRoot/StFtt* @jdbrice
/StRoot/StFwd* @jdbrice
/StRoot/StGenericVertexMaker @plexoos @perevbnlgov @akioogawa @klendathu2k @fisyak
/StRoot/StGenericVertexMaker @plexoos @perevbnlgov @akioogawa @klendathu2k @fisyak @R-Witt @iraklic
/StRoot/StHbtMaker @JohnTheBlindMilkman @DanielWielanek
/StRoot/StHeavyPool @starsdong @fgeurts
/StRoot/StIOMaker @plexoos @perevbnlgov
/StRoot/StIst* @plexoos @starsdong
/StRoot/StJetFinder @zlchang @veprbl
/StRoot/StJetMaker @zlchang @veprbl
/StRoot/StLaser* @fisyak
/StRoot/StLaser* @fisyak @R-Witt @iraklic
/StRoot/StMCFilter @klendathu2k
/StRoot/StMagF @fisyak
/StRoot/StMagF @fisyak @R-Witt @iraklic
/StRoot/StMc* @klendathu2k @perevbnlgov
/StRoot/StMcAnalysisMaker @klendathu2k
/StRoot/StMcEvent* @klendathu2k
/StRoot/StMiniMc* @klendathu2k @fisyak @zhux97
/StRoot/StMiniMc* @klendathu2k @fisyak @R-Witt @iraklic @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 @lbavinh
/StRoot/StRHICf* @ggfdsa10
/StRoot/StRTSClient @jml985 @tonko-lj
/StRoot/StShadowMaker @genevb
/StRoot/StSpinPool @akioogawa @zlchang @veprbl
/StRoot/StSsd* @starsdong @plexoos
/StRoot/StSst* @starsdong @plexoos
/StRoot/StStarLogger @fisyak
/StRoot/StTableUtilities @fisyak
/StRoot/StTagsMaker @fisyak
/StRoot/StStarLogger @fisyak @R-Witt @iraklic
/StRoot/StTableUtilities @fisyak @R-Witt @iraklic
/StRoot/StTagsMaker @fisyak @R-Witt @iraklic
/StRoot/StTof* @jdbrice @fgeurts @starsdong
/StRoot/StTpc* @fisyak
/StRoot/StTpc* @fisyak @R-Witt @iraklic
/StRoot/StTreeMaker @perevbnlgov
/StRoot/StTriggerDataMaker @akioogawa
/StRoot/StTriggerUtilities @zlchang @akioogawa @jml985
/StRoot/StTrsMaker @fisyak @iraklic
/StRoot/StTrsMaker @fisyak @R-Witt @iraklic
/StRoot/StUtilities/StMess* @genevb
/StRoot/StUtilities/StMultiH* @genevb
/StRoot/StVpd* @ZaochenYe @fgeurts
/StRoot/StXTrakMaker @perevbnlgov
/StRoot/St_QA_Maker @genevb
/StRoot/St_TLA_Maker @perevbnlgov
/StRoot/St_base* @perevbnlgov @fisyak
/StRoot/St_base* @perevbnlgov @fisyak @R-Witt @iraklic
/StRoot/St_db_Maker @dmarkh @perevbnlgov
/StRoot/St_geant_Maker @klendathu2k @perevbnlgov @fisyak
/StRoot/St_geant_Maker @klendathu2k @perevbnlgov @fisyak @R-Witt @iraklic
/StRoot/St_geant_Maker/Embed @zhux97
/StRoot/St_l3Clufi_Maker @jml985 @tonko-lj
/StRoot/St_l3t_Maker @jml985 @tonko-lj
/StRoot/St_tcl_Maker @fisyak @iraklic
/StRoot/Star2Root @perevbnlgov @fisyak
/StRoot/St_tcl_Maker @fisyak @R-Witt @iraklic
/StRoot/Star2Root @perevbnlgov @fisyak @R-Witt @iraklic
/StRoot/StarClassLibrary @klendathu2k
/StRoot/StarGenerator @klendathu2k @perevbnlgov
/StRoot/StarMagField @fisyak
/StRoot/StarRoot @klendathu2k @perevbnlgov @fisyak
/StRoot/StdEdx* @fisyak
/StRoot/Sti* @klendathu2k @plexoos @starsdong @perevbnlgov @fisyak
/StRoot/StarMagField @fisyak @R-Witt @iraklic
/StRoot/StarRoot @klendathu2k @perevbnlgov @fisyak @R-Witt @iraklic
/StRoot/StdEdx* @fisyak @R-Witt @iraklic
/StRoot/Sti* @klendathu2k @plexoos @starsdong @perevbnlgov @fisyak @R-Witt @iraklic
/StRoot/Stl3* @jml985 @tonko-lj
/StRoot/Stv* @perevbnlgov
/StRoot/StvUtil @klendathu2k @perevbnlgov
/StRoot/TPCCATracker @fisyak
/StRoot/macros @genevb @plexoos @fisyak
/StRoot/TPCCATracker @fisyak @R-Witt @iraklic
/StRoot/macros @genevb @plexoos @fisyak @R-Witt @iraklic
/StRoot/macros/embedding @zhux97
/StRoot/macros/mudst @nigmatkulov @plexoos
/StarDb @dmarkh @perevbnlgov @fisyak
/StarDb @dmarkh @perevbnlgov @fisyak @R-Witt @iraklic
/StarDb/AgML* @klendathu2k
/StarDb/AgiGeometry @klendathu2k
/StarDb/Calibrations @genevb
/StarDb/Calibrations/emc @kkauder @rkunnawa @Navagyan
/StarDb/Calibrations/tof @ZaochenYe @fgeurts
/StarDb/Calibrations/tpc @fisyak @iraklic
/StarDb/Calibrations/tpc @fisyak @R-Witt @iraklic
/StarDb/Calibrations/tracker @klendathu2k
/StarDb/Geometry @genevb @klendathu2k
/StarDb/Geometry/tpc @fisyak @iraklic
/StarDb/Geometry/tpc @fisyak @R-Witt @iraklic
/StarDb/VmcGeometry @klendathu2k
/StarDb/emc @kkauder @rkunnawa @Navagyan
/StarVMC @klendathu2k
/StarVMC/geant3 @fisyak
/StarVMC/geant3 @fisyak @R-Witt @iraklic
/StarVMC/Geometry @klendathu2k
/StarVMC/GeoTestMaker @perevbnlgov
/StarVMC/minicern @perevbnlgov
/StarVMC/StarAgml* @klendathu2k
/StarVMC/StarBASE @klendathu2k
/StarVMC/StarGeometry @klendathu2k
/StarVMC/StarVMCApplication @fisyak
/StarVMC/StarVMCApplication @fisyak @R-Witt @iraklic
/StarVMC/xgeometry @klendathu2k
/mgr @genevb @klendathu2k @fisyak @plexoos
/pams @klendathu2k @fisyak
/mgr @genevb @klendathu2k @fisyak @R-Witt @iraklic @plexoos
/pams @klendathu2k @fisyak @R-Witt @iraklic
/pams/sim @akioogawa @klendathu2k
/pams/tables @dmarkh
/asps @klendathu2k @perevbnlgov
30 changes: 4 additions & 26 deletions .github/workflows/build-pull-request.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,17 @@ jobs:
name: star-sw-${{ env.STARENV }}
path: /tmp/star-sw-${{ env.STARENV }}.tar

ROOT5_test:
test:
runs-on: ubuntu-latest
needs: build
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, 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]
starenv: [root5, root6]
compiler: [gcc485]
env:
STARENV: root5-${{ matrix.compiler }}
STARENV: ${{ matrix.starenv }}-${{ matrix.compiler }}
steps:
- name: Download artifact
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -115,26 +116,3 @@ jobs:
TEST_CMD="root4star -b -q -l 'StRoot/macros/analysis/find_vertex.C(\"$TEST_FILE\")'"
docker run --volumes-from star-test-data ghcr.io/star-bnl/star-sw-${{ env.STARENV }} \
sh -c "set -e; $TEST_CMD 2>&1 | tee log; grep '<StIOMaker::Finish> StIO:' log"
ROOT6_test_ignore_fail:
runs-on: ubuntu-latest
needs: build
strategy:
fail-fast: false
matrix:
test_id: [50, 52, 54, 90, 91, 92, 119, 120]
env:
STARENV: root6-gcc485
steps:
- name: Download artifact
uses: actions/download-artifact@v3
with:
name: star-sw-${{ env.STARENV }}
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: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 }} \
sh -c "MALLOC_CHECK_=3 $TEST_CMD || echo 'Failed with an exit code: '\$?"
47 changes: 47 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,52 @@
# Changelog

## SL23d_0 - 2023-06-14

## What's Changed

* Added centrality procedure instructions by @zsweger in ([#513](https://github.com/star-bnl/star-sw/pull/513))
* Assorted updates in OnlTools/Jevp for 2023 run by @jml985 in ([#515](https://github.com/star-bnl/star-sw/pull/515))
* Remove unused file StRoot/StEvent/StDetectorId.inc by @plexoos in ([#517](https://github.com/star-bnl/star-sw/pull/517))
* new RHICf library (only raw data saving part) by @ggfdsa10 in ([#511](https://github.com/star-bnl/star-sw/pull/511))
* update CODEOWNERS for PWGTools directory by @starsdong in ([#518](https://github.com/star-bnl/star-sw/pull/518))
* Auau200gev run19 strefmultcorr by @zsweger in ([#514](https://github.com/star-bnl/star-sw/pull/514))
* added owners for a few subsystems by @starsdong in ([#520](https://github.com/star-bnl/star-sw/pull/520))
* Summer 2023 updates by @jml985 in ([#516](https://github.com/star-bnl/star-sw/pull/516))
* Automated run-by-run QA package (version-2) for STAR BES-II dataset QA. by @EllipticFlow in ([#521](https://github.com/star-bnl/star-sw/pull/521))
* fix: remove ClassDef from StEpdGeom by @plexoos in ([#522](https://github.com/star-bnl/star-sw/pull/522))
* Additon of StFwdTrack to StEvent, updates to StFwdTrackMaker to accomodate by @jdbrice in ([#492](https://github.com/star-bnl/star-sw/pull/492))
* RHICf Sub-reconstruction tool (StRHICfPID) by @ggfdsa10 in ([#519](https://github.com/star-bnl/star-sw/pull/519))
* StNbdFitMaker.cxx: update centrality calculation by @zsweger in ([#512](https://github.com/star-bnl/star-sw/pull/512))
* New RHICf sub-reconstruction tool (StRHICfRecoPos) by @ggfdsa10 in ([#524](https://github.com/star-bnl/star-sw/pull/524))
* Update to remove logging from itpc cluster finder by @jml985 in ([#532](https://github.com/star-bnl/star-sw/pull/532))
* Edited mistake in params file by @zsweger in ([#531](https://github.com/star-bnl/star-sw/pull/531))
* New RHICf sub-reconstruction tool (StRHICfRecoEnergy) by @ggfdsa10 in ([#527](https://github.com/star-bnl/star-sw/pull/527))
* Star simulations 2023 ideal timestamp by @klendathu2k in ([#534](https://github.com/star-bnl/star-sw/pull/534))
* Run23 prep by @genevb in ([#536](https://github.com/star-bnl/star-sw/pull/536))
* run by run v3 with font removed by @ssedd1123 in ([#526](https://github.com/star-bnl/star-sw/pull/526))
* Enable default STAR Spack environment by @plexoos in ([#496](https://github.com/star-bnl/star-sw/pull/496))
* fix(env): clean up previously loaded module before activating new env by @plexoos in ([#542](https://github.com/star-bnl/star-sw/pull/542))
* Fix for DAQ5k cluster finder dropping outer two RDOs of TPX bug by @jml985 in ([#541](https://github.com/star-bnl/star-sw/pull/541))
* fix: load libiconv module into envs by @plexoos in ([#543](https://github.com/star-bnl/star-sw/pull/543))
* Remove some functions in StRHICfFunction by @ggfdsa10 in ([#533](https://github.com/star-bnl/star-sw/pull/533))
* RHICf Run and Event number added in StRHICfCollection by @ggfdsa10 in ([#544](https://github.com/star-bnl/star-sw/pull/544))
* Updated default behavior of run-by-run QA according to agreement in QA meeting on 5/19 by @ssedd1123 in ([#545](https://github.com/star-bnl/star-sw/pull/545))
* Add RHICf Run and Event number address in StRHICfDbMaker by @ggfdsa10 in ([#546](https://github.com/star-bnl/star-sw/pull/546))
* Add RHICf Run and Event number in StMuRHICfxxx by @ggfdsa10 in ([#548](https://github.com/star-bnl/star-sw/pull/548))
* Add RHICfRun and Event number in StRHICfRawHitMaker by @ggfdsa10 in ([#551](https://github.com/star-bnl/star-sw/pull/551))
* Mask counters for production by @YannickSoehngen in ([#550](https://github.com/star-bnl/star-sw/pull/550))
* Small additions to StFcsWaveformFitMaker and some macros for test level 6 by @dkapukchyan in ([#549](https://github.com/star-bnl/star-sw/pull/549))

## New Contributors

* @zsweger made their first contribution in ([#513](https://github.com/star-bnl/star-sw/pull/513))
* @ggfdsa10 made their first contribution in ([#511](https://github.com/star-bnl/star-sw/pull/511))
* @EllipticFlow made their first contribution in ([#521](https://github.com/star-bnl/star-sw/pull/521))
* @ssedd1123 made their first contribution in ([#526](https://github.com/star-bnl/star-sw/pull/526))

**Full Changelog**: https://github.com/star-bnl/star-sw/compare/SL23b_0...SL23d_0


## SL23a_0 - 2023-01-15

## What's Changed
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG starenv=root5
# Pick one from [gcc485, gcc11]
ARG compiler=gcc485

FROM ghcr.io/star-bnl/star-spack:v0.2.3-${starenv}-${compiler}
FROM ghcr.io/star-bnl/star-spack:v0.3.0-${starenv}-${compiler}

ARG compiler

Expand Down
2 changes: 1 addition & 1 deletion OnlTools/Jevp/StJevpBuilders/LaserReader.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ float LaserReader::Make(daqReader *rdr)
if(s == 16) continue;


daq_dta *dd = rdr->det("tpx")->get("cld",s,6); // only care about padrow 45!
daq_dta *dd = rdr->det("tpx")->get("cld",s); // only care about padrow 45!
if(!dd) continue;

while(dd->iterate()) {
Expand Down
Loading

0 comments on commit b7b6d86

Please sign in to comment.