Skip to content

Commit 6222fab

Browse files
author
[email protected]
committed
resolve merge conflic with pull of main
2 parents a392a26 + 7fd7f97 commit 6222fab

File tree

90 files changed

+4050
-587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+4050
-587
lines changed

‎.github/CODEOWNERS‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
.github/ @plexoos @veprbl
33
/OnlTools @plexoos @jml985
44
/StDb @dmarkh
5-
/StDb/idl @akioogawa @dmarkh @fgeurts @iraklic @fisyak
5+
/StDb/idl @akioogawa @dmarkh @fgeurts @iraklic @fisyak @R-Witt
66
/StRoot/PWGTools @nigmatkulov @zsweger @marrbnl
77
/StRoot/RTS @akioogawa @jml985 @tonko-lj
8-
/StRoot/StAnalysisMaker @fisyak
8+
/StRoot/StAnalysisMaker @fisyak @R-Witt @iraklic
99
/StRoot/StAnalysisUtilities/StHistUtil* @genevb
1010
/StRoot/StAssociationMaker/EMC @kkauder @rkunnawa @Navagyan
11-
/StRoot/StBFChain @genevb @plexoos @klendathu2k @fisyak
12-
/StRoot/StBichsel @fisyak
11+
/StRoot/StBFChain @genevb @plexoos @klendathu2k @fisyak @R-Witt @iraklic
12+
/StRoot/StBichsel @fisyak @R-Witt @iraklic
1313
/StRoot/StBTof* @ZaochenYe @fgeurts @starsdong @jdbrice
1414
/StRoot/StBbcSimulationMaker @akioogawa
15-
/StRoot/StChain @klendathu2k @perevbnlgov @fisyak
15+
/StRoot/StChain @klendathu2k @perevbnlgov @fisyak @R-Witt @iraklic
1616
/StRoot/StDAQMaker @perevbnlgov @akioogawa
1717
/StRoot/StDaqLib @jml985
1818
/StRoot/StDaqLib/EEMC @kkauder @rkunnawa @zlchang
@@ -25,9 +25,9 @@
2525
/StRoot/StDaqLib/TRG @akioogawa
2626
/StRoot/StDataFilterMaker @genevb
2727
/StRoot/StDb* @dmarkh
28-
/StRoot/StDbUtilities @fisyak
28+
/StRoot/StDbUtilities @fisyak @R-Witt @iraklic
2929
/StRoot/StDbUtilities/StMagUtilities* @genevb
30-
/StRoot/StDetectorDbMaker @dmarkh @fisyak
30+
/StRoot/StDetectorDbMaker @dmarkh @fisyak @R-Witt @iraklic
3131
/StRoot/StDetectorDbMaker/StDetectorDbBeamInfo* @genevb
3232
/StRoot/StDetectorDbMaker/StDetectorDbGridLeak* @genevb
3333
/StRoot/StDetectorDbMaker/StDetectorDbRichScalers* @genevb
@@ -49,7 +49,7 @@
4949
/StRoot/StEmbeddingUtilities @zhux97
5050
/StRoot/StEpd* @Femtoscopist
5151
/StRoot/StEvent* @klendathu2k
52-
/StRoot/StEvent/StTpc* @fisyak
52+
/StRoot/StEvent/StTpc* @fisyak @R-Witt @iraklic
5353
/StRoot/StEventUtilities/StEbyET0* @genevb
5454
/StRoot/StEventUtilities/StRedoTracks* @genevb
5555
/StRoot/StEventUtilities/StuFixTopoMap* @genevb
@@ -60,20 +60,20 @@
6060
/StRoot/StFst* @jdbrice @sunxuhit @yezhenyu2003 @techuan-huang
6161
/StRoot/StFtt* @jdbrice
6262
/StRoot/StFwd* @jdbrice
63-
/StRoot/StGenericVertexMaker @plexoos @perevbnlgov @akioogawa @klendathu2k @fisyak
63+
/StRoot/StGenericVertexMaker @plexoos @perevbnlgov @akioogawa @klendathu2k @fisyak @R-Witt @iraklic
6464
/StRoot/StHbtMaker @JohnTheBlindMilkman @DanielWielanek
6565
/StRoot/StHeavyPool @starsdong @fgeurts
6666
/StRoot/StIOMaker @plexoos @perevbnlgov
6767
/StRoot/StIst* @plexoos @starsdong
6868
/StRoot/StJetFinder @zlchang @veprbl
6969
/StRoot/StJetMaker @zlchang @veprbl
70-
/StRoot/StLaser* @fisyak
70+
/StRoot/StLaser* @fisyak @R-Witt @iraklic
7171
/StRoot/StMCFilter @klendathu2k
72-
/StRoot/StMagF @fisyak
72+
/StRoot/StMagF @fisyak @R-Witt @iraklic
7373
/StRoot/StMc* @klendathu2k @perevbnlgov
7474
/StRoot/StMcAnalysisMaker @klendathu2k
7575
/StRoot/StMcEvent* @klendathu2k
76-
/StRoot/StMiniMc* @klendathu2k @fisyak @zhux97
76+
/StRoot/StMiniMc* @klendathu2k @fisyak @R-Witt @iraklic @zhux97
7777
/StRoot/StMtd* @marrbnl
7878
/StRoot/StMuDSTMaker @jdbrice
7979
/StRoot/StMuDSTMaker/EMC @kkauder @rkunnawa @Navagyan
@@ -87,66 +87,66 @@
8787
/StRoot/StSpinPool @akioogawa @zlchang @veprbl
8888
/StRoot/StSsd* @starsdong @plexoos
8989
/StRoot/StSst* @starsdong @plexoos
90-
/StRoot/StStarLogger @fisyak
91-
/StRoot/StTableUtilities @fisyak
92-
/StRoot/StTagsMaker @fisyak
90+
/StRoot/StStarLogger @fisyak @R-Witt @iraklic
91+
/StRoot/StTableUtilities @fisyak @R-Witt @iraklic
92+
/StRoot/StTagsMaker @fisyak @R-Witt @iraklic
9393
/StRoot/StTof* @jdbrice @fgeurts @starsdong
94-
/StRoot/StTpc* @fisyak
94+
/StRoot/StTpc* @fisyak @R-Witt @iraklic
9595
/StRoot/StTreeMaker @perevbnlgov
9696
/StRoot/StTriggerDataMaker @akioogawa
9797
/StRoot/StTriggerUtilities @zlchang @akioogawa @jml985
98-
/StRoot/StTrsMaker @fisyak @iraklic
98+
/StRoot/StTrsMaker @fisyak @R-Witt @iraklic
9999
/StRoot/StUtilities/StMess* @genevb
100100
/StRoot/StUtilities/StMultiH* @genevb
101101
/StRoot/StVpd* @ZaochenYe @fgeurts
102102
/StRoot/StXTrakMaker @perevbnlgov
103103
/StRoot/St_QA_Maker @genevb
104104
/StRoot/St_TLA_Maker @perevbnlgov
105-
/StRoot/St_base* @perevbnlgov @fisyak
105+
/StRoot/St_base* @perevbnlgov @fisyak @R-Witt @iraklic
106106
/StRoot/St_db_Maker @dmarkh @perevbnlgov
107-
/StRoot/St_geant_Maker @klendathu2k @perevbnlgov @fisyak
107+
/StRoot/St_geant_Maker @klendathu2k @perevbnlgov @fisyak @R-Witt @iraklic
108108
/StRoot/St_geant_Maker/Embed @zhux97
109109
/StRoot/St_l3Clufi_Maker @jml985 @tonko-lj
110110
/StRoot/St_l3t_Maker @jml985 @tonko-lj
111-
/StRoot/St_tcl_Maker @fisyak @iraklic
112-
/StRoot/Star2Root @perevbnlgov @fisyak
111+
/StRoot/St_tcl_Maker @fisyak @R-Witt @iraklic
112+
/StRoot/Star2Root @perevbnlgov @fisyak @R-Witt @iraklic
113113
/StRoot/StarClassLibrary @klendathu2k
114114
/StRoot/StarGenerator @klendathu2k @perevbnlgov
115-
/StRoot/StarMagField @fisyak
116-
/StRoot/StarRoot @klendathu2k @perevbnlgov @fisyak
117-
/StRoot/StdEdx* @fisyak
118-
/StRoot/Sti* @klendathu2k @plexoos @starsdong @perevbnlgov @fisyak
115+
/StRoot/StarMagField @fisyak @R-Witt @iraklic
116+
/StRoot/StarRoot @klendathu2k @perevbnlgov @fisyak @R-Witt @iraklic
117+
/StRoot/StdEdx* @fisyak @R-Witt @iraklic
118+
/StRoot/Sti* @klendathu2k @plexoos @starsdong @perevbnlgov @fisyak @R-Witt @iraklic
119119
/StRoot/Stl3* @jml985 @tonko-lj
120120
/StRoot/Stv* @perevbnlgov
121121
/StRoot/StvUtil @klendathu2k @perevbnlgov
122-
/StRoot/TPCCATracker @fisyak
123-
/StRoot/macros @genevb @plexoos @fisyak
122+
/StRoot/TPCCATracker @fisyak @R-Witt @iraklic
123+
/StRoot/macros @genevb @plexoos @fisyak @R-Witt @iraklic
124124
/StRoot/macros/embedding @zhux97
125125
/StRoot/macros/mudst @nigmatkulov @plexoos
126-
/StarDb @dmarkh @perevbnlgov @fisyak
126+
/StarDb @dmarkh @perevbnlgov @fisyak @R-Witt @iraklic
127127
/StarDb/AgML* @klendathu2k
128128
/StarDb/AgiGeometry @klendathu2k
129129
/StarDb/Calibrations @genevb
130130
/StarDb/Calibrations/emc @kkauder @rkunnawa @Navagyan
131131
/StarDb/Calibrations/tof @ZaochenYe @fgeurts
132-
/StarDb/Calibrations/tpc @fisyak @iraklic
132+
/StarDb/Calibrations/tpc @fisyak @R-Witt @iraklic
133133
/StarDb/Calibrations/tracker @klendathu2k
134134
/StarDb/Geometry @genevb @klendathu2k
135-
/StarDb/Geometry/tpc @fisyak @iraklic
135+
/StarDb/Geometry/tpc @fisyak @R-Witt @iraklic
136136
/StarDb/VmcGeometry @klendathu2k
137137
/StarDb/emc @kkauder @rkunnawa @Navagyan
138138
/StarVMC @klendathu2k
139-
/StarVMC/geant3 @fisyak
139+
/StarVMC/geant3 @fisyak @R-Witt @iraklic
140140
/StarVMC/Geometry @klendathu2k
141141
/StarVMC/GeoTestMaker @perevbnlgov
142142
/StarVMC/minicern @perevbnlgov
143143
/StarVMC/StarAgml* @klendathu2k
144144
/StarVMC/StarBASE @klendathu2k
145145
/StarVMC/StarGeometry @klendathu2k
146-
/StarVMC/StarVMCApplication @fisyak
146+
/StarVMC/StarVMCApplication @fisyak @R-Witt @iraklic
147147
/StarVMC/xgeometry @klendathu2k
148-
/mgr @genevb @klendathu2k @fisyak @plexoos
149-
/pams @klendathu2k @fisyak
148+
/mgr @genevb @klendathu2k @fisyak @R-Witt @iraklic @plexoos
149+
/pams @klendathu2k @fisyak @R-Witt @iraklic
150150
/pams/sim @akioogawa @klendathu2k
151151
/pams/tables @dmarkh
152152
/asps @klendathu2k @perevbnlgov

‎CHANGELOG.md‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,52 @@
11
# Changelog
22

3+
## SL23d_0 - 2023-06-14
4+
5+
## What's Changed
6+
7+
* Added centrality procedure instructions by @zsweger in ([#513](https://github.com/star-bnl/star-sw/pull/513))
8+
* Assorted updates in OnlTools/Jevp for 2023 run by @jml985 in ([#515](https://github.com/star-bnl/star-sw/pull/515))
9+
* Remove unused file StRoot/StEvent/StDetectorId.inc by @plexoos in ([#517](https://github.com/star-bnl/star-sw/pull/517))
10+
* new RHICf library (only raw data saving part) by @ggfdsa10 in ([#511](https://github.com/star-bnl/star-sw/pull/511))
11+
* update CODEOWNERS for PWGTools directory by @starsdong in ([#518](https://github.com/star-bnl/star-sw/pull/518))
12+
* Auau200gev run19 strefmultcorr by @zsweger in ([#514](https://github.com/star-bnl/star-sw/pull/514))
13+
* added owners for a few subsystems by @starsdong in ([#520](https://github.com/star-bnl/star-sw/pull/520))
14+
* Summer 2023 updates by @jml985 in ([#516](https://github.com/star-bnl/star-sw/pull/516))
15+
* 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))
16+
* fix: remove ClassDef from StEpdGeom by @plexoos in ([#522](https://github.com/star-bnl/star-sw/pull/522))
17+
* Additon of StFwdTrack to StEvent, updates to StFwdTrackMaker to accomodate by @jdbrice in ([#492](https://github.com/star-bnl/star-sw/pull/492))
18+
* RHICf Sub-reconstruction tool (StRHICfPID) by @ggfdsa10 in ([#519](https://github.com/star-bnl/star-sw/pull/519))
19+
* StNbdFitMaker.cxx: update centrality calculation by @zsweger in ([#512](https://github.com/star-bnl/star-sw/pull/512))
20+
* New RHICf sub-reconstruction tool (StRHICfRecoPos) by @ggfdsa10 in ([#524](https://github.com/star-bnl/star-sw/pull/524))
21+
* Update to remove logging from itpc cluster finder by @jml985 in ([#532](https://github.com/star-bnl/star-sw/pull/532))
22+
* Edited mistake in params file by @zsweger in ([#531](https://github.com/star-bnl/star-sw/pull/531))
23+
* New RHICf sub-reconstruction tool (StRHICfRecoEnergy) by @ggfdsa10 in ([#527](https://github.com/star-bnl/star-sw/pull/527))
24+
* Star simulations 2023 ideal timestamp by @klendathu2k in ([#534](https://github.com/star-bnl/star-sw/pull/534))
25+
* Run23 prep by @genevb in ([#536](https://github.com/star-bnl/star-sw/pull/536))
26+
* run by run v3 with font removed by @ssedd1123 in ([#526](https://github.com/star-bnl/star-sw/pull/526))
27+
* Enable default STAR Spack environment by @plexoos in ([#496](https://github.com/star-bnl/star-sw/pull/496))
28+
* fix(env): clean up previously loaded module before activating new env by @plexoos in ([#542](https://github.com/star-bnl/star-sw/pull/542))
29+
* 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))
30+
* fix: load libiconv module into envs by @plexoos in ([#543](https://github.com/star-bnl/star-sw/pull/543))
31+
* Remove some functions in StRHICfFunction by @ggfdsa10 in ([#533](https://github.com/star-bnl/star-sw/pull/533))
32+
* RHICf Run and Event number added in StRHICfCollection by @ggfdsa10 in ([#544](https://github.com/star-bnl/star-sw/pull/544))
33+
* 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))
34+
* Add RHICf Run and Event number address in StRHICfDbMaker by @ggfdsa10 in ([#546](https://github.com/star-bnl/star-sw/pull/546))
35+
* Add RHICf Run and Event number in StMuRHICfxxx by @ggfdsa10 in ([#548](https://github.com/star-bnl/star-sw/pull/548))
36+
* Add RHICfRun and Event number in StRHICfRawHitMaker by @ggfdsa10 in ([#551](https://github.com/star-bnl/star-sw/pull/551))
37+
* Mask counters for production by @YannickSoehngen in ([#550](https://github.com/star-bnl/star-sw/pull/550))
38+
* Small additions to StFcsWaveformFitMaker and some macros for test level 6 by @dkapukchyan in ([#549](https://github.com/star-bnl/star-sw/pull/549))
39+
40+
## New Contributors
41+
42+
* @zsweger made their first contribution in ([#513](https://github.com/star-bnl/star-sw/pull/513))
43+
* @ggfdsa10 made their first contribution in ([#511](https://github.com/star-bnl/star-sw/pull/511))
44+
* @EllipticFlow made their first contribution in ([#521](https://github.com/star-bnl/star-sw/pull/521))
45+
* @ssedd1123 made their first contribution in ([#526](https://github.com/star-bnl/star-sw/pull/526))
46+
47+
**Full Changelog**: https://github.com/star-bnl/star-sw/compare/SL23b_0...SL23d_0
48+
49+
350
## SL23a_0 - 2023-01-15
451

552
## What's Changed

‎OnlTools/Jevp/StJevpBuilders/LaserReader.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ float LaserReader::Make(daqReader *rdr)
8181
if(s == 16) continue;
8282

8383

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

8787
while(dd->iterate()) {

0 commit comments

Comments
 (0)