Skip to content

Commit d8ee31d

Browse files
abylinkinabylinkin
authored
Add files via upload
1 parent 320e97a commit d8ee31d

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

‎PWGUD/TableProducer/DGBCCandProducer.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,11 +279,11 @@ struct DGBCCandProducer {
279279

280280
// update UDTables
281281
template <typename TTracks>
282-
void updateUDTables(bool onlyPV, int64_t colID, uint64_t bcnum, int rnum, float vx, float vy, float vz,
282+
void updateUDTables(bool onlyPV, int64_t colID, uint64_t bcnum, int rnum, float vx, float vy, float vz, int flag,
283283
uint16_t const& ntrks, int8_t const& ncharge, float const& rtrwTOF,
284284
TTracks const& tracks, upchelpers::FITInfo const& fitInfo)
285285
{
286-
outputCollisions(bcnum, rnum, vx, vy, vz, ntrks, ncharge, rtrwTOF);
286+
outputCollisions(bcnum, rnum, vx, vy, vz, flag, ntrks, ncharge, rtrwTOF);
287287
outputCollisionsSels(fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFT0A, fitInfo.timeFT0C,
288288
fitInfo.triggerMaskFT0,
289289
fitInfo.ampFDDA, fitInfo.ampFDDC, fitInfo.timeFDDA, fitInfo.timeFDDC,
@@ -416,7 +416,7 @@ struct DGBCCandProducer {
416416
rtrwTOF = udhelpers::rPVtrwTOF<true>(colTracks, col.numContrib());
417417
nCharge = udhelpers::netCharge<true>(colTracks);
418418

419-
updateUDTables(false, col.globalIndex(), bc.globalBC(), bc.runNumber(), col.posX(), col.posY(), col.posZ(),
419+
updateUDTables(false, col.globalIndex(), bc.globalBC(), bc.runNumber(), col.posX(), col.posY(), col.posZ(), col.flags(),
420420
col.numContrib(), nCharge, rtrwTOF, colTracks, fitInfo);
421421
}
422422
} else {
@@ -448,7 +448,7 @@ struct DGBCCandProducer {
448448
rtrwTOF = udhelpers::rPVtrwTOF<false>(tracksArray, tracksArray.size());
449449
nCharge = udhelpers::netCharge<false>(tracksArray);
450450

451-
updateUDTables(false, -1, bc.globalBC(), bc.runNumber(), -2., 2., -2,
451+
updateUDTables(false, -1, bc.globalBC(), bc.runNumber(), -2., 2., -2, 0,
452452
tracksArray.size(), nCharge, rtrwTOF, tracksArray, fitInfo);
453453
}
454454
}
@@ -494,7 +494,7 @@ struct DGBCCandProducer {
494494
rtrwTOF = udhelpers::rPVtrwTOF<false>(tracksArray, tracksArray.size());
495495
nCharge = udhelpers::netCharge<false>(tracksArray);
496496

497-
updateUDTables(false, -1, bcnum, tibc.runNumber(), -3., 3., -3,
497+
updateUDTables(false, -1, bcnum, tibc.runNumber(), -3., 3., -3, 0,
498498
tracksArray.size(), nCharge, rtrwTOF, tracksArray, fitInfo);
499499
}
500500
}
@@ -612,7 +612,7 @@ struct DGBCCandProducer {
612612
auto rtrwTOF = udhelpers::rPVtrwTOF<true>(colTracks, col.numContrib());
613613
auto nCharge = udhelpers::netCharge<true>(colTracks);
614614
udhelpers::getFITinfo(fitInfo, bc, bcs, ft0s, fv0as, fdds);
615-
updateUDTables(false, col.globalIndex(), bcnum, bc.runNumber(), col.posX(), col.posY(), col.posZ(),
615+
updateUDTables(false, col.globalIndex(), bcnum, bc.runNumber(), col.posX(), col.posY(), col.posZ(), col.flags(),
616616
col.numContrib(), nCharge, rtrwTOF, colTracks, fitInfo);
617617
// fill UDZdcs
618618
if (bc.has_zdc()) {
@@ -681,7 +681,7 @@ struct DGBCCandProducer {
681681
}
682682

683683
int64_t colID = withCollision ? col.globalIndex() : -1;
684-
updateUDTables(false, colID, bcnum, tibc.runNumber(), vpos[0], vpos[1], vpos[2],
684+
updateUDTables(false, colID, bcnum, tibc.runNumber(), vpos[0], vpos[1], vpos[2], col.flags(),
685685
tracksArray.size(), nCharge, rtrwTOF, tracksArray, fitInfo);
686686
// fill UDZdcs
687687
if (bc.globalBC() == bcnum) {

‎PWGUD/TableProducer/DGCandProducer.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ struct DGCandProducer {
270270
// update DG candidates tables
271271
auto rtrwTOF = udhelpers::rPVtrwTOF<true>(tracks, collision.numContrib());
272272
outputCollisions(bc.globalBC(), bc.runNumber(),
273-
collision.posX(), collision.posY(), collision.posZ(),
273+
collision.posX(), collision.posY(), collision.posZ(), collision.flags(),
274274
collision.numContrib(), udhelpers::netCharge<true>(tracks),
275275
rtrwTOF);
276276
outputCollisionsSels(fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFT0A, fitInfo.timeFT0C,

‎PWGUD/TableProducer/SGCandProducer.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,10 @@ struct SGCandProducer {
214214
udhelpers::getFITinfo(fitInfo, newbc, bcs, ft0s, fv0as, fdds);
215215
// update SG candidates tables
216216
outputCollisions(bc.globalBC(), bc.runNumber(),
217-
collision.posX(), collision.posY(), collision.posZ(),
217+
collision.posX(), collision.posY(), collision.posZ(), collision.flags(),
218218
collision.numContrib(), udhelpers::netCharge<true>(tracks),
219219
1.); // rtrwTOF); //omit the calculation to speed up the things while skimming
220+
220221
outputSGCollisions(issgevent);
221222
outputCollisionsSels(fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFT0A, fitInfo.timeFT0C,
222223
fitInfo.triggerMaskFT0,

‎PWGUD/TableProducer/UPCCandidateProducer.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ struct UpcCandProducer {
917917
RgtrwTOF = RgtrwTOF / static_cast<float>(numContrib);
918918
// store used tracks
919919
fillBarrelTracks(barrelTracks, barrelTrackIDs, candID, globalBC, closestBcITSTPC, mcBarrelTrackLabels, ambBarrelTrBCs);
920-
eventCandidates(globalBC, runNumber, dummyX, dummyY, dummyZ, numContrib, netCharge, RgtrwTOF);
920+
eventCandidates(globalBC, runNumber, dummyX, dummyY, dummyZ, bcs.iteratorAt(0).flags(), numContrib, netCharge, RgtrwTOF);
921921
eventCandidatesSels(fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFT0A, fitInfo.timeFT0C, fitInfo.triggerMaskFT0,
922922
fitInfo.ampFDDA, fitInfo.ampFDDC, fitInfo.timeFDDA, fitInfo.timeFDDC, fitInfo.triggerMaskFDD,
923923
fitInfo.ampFV0A, fitInfo.timeFV0A, fitInfo.triggerMaskFV0A,
@@ -982,7 +982,7 @@ struct UpcCandProducer {
982982
RgtrwTOF = RgtrwTOF / static_cast<float>(numContrib);
983983
// store used tracks
984984
fillBarrelTracks(barrelTracks, barrelTrackIDs, candID, globalBC, closestBcITSTPC, mcBarrelTrackLabels, ambBarrelTrBCs);
985-
eventCandidates(globalBC, runNumber, dummyX, dummyY, dummyZ, numContrib, netCharge, RgtrwTOF);
985+
eventCandidates(globalBC, runNumber, dummyX, dummyY, dummyZ, bcs.iteratorAt(0).flags(), numContrib, netCharge, RgtrwTOF);
986986
eventCandidatesSels(fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFT0A, fitInfo.timeFT0C, fitInfo.triggerMaskFT0,
987987
fitInfo.ampFDDA, fitInfo.ampFDDC, fitInfo.timeFDDA, fitInfo.timeFDDC, fitInfo.triggerMaskFDD,
988988
fitInfo.ampFV0A, fitInfo.timeFV0A, fitInfo.triggerMaskFV0A,
@@ -1159,7 +1159,7 @@ struct UpcCandProducer {
11591159
// store used tracks
11601160
fillFwdTracks(fwdTracks, fwdTrackIDs, candID, bc, bc, mcFwdTrackLabels);
11611161
fillBarrelTracks(barrelTracks, barrelTrackIDs, candID, bc, bc, mcBarrelTrackLabels, ambBarrelTrBCs);
1162-
eventCandidates(bc, runNumber, dummyX, dummyY, dummyZ, numContrib, netCharge, RgtrwTOF);
1162+
eventCandidates(bc, runNumber, dummyX, dummyY, dummyZ, bcs.iteratorAt(0).flags(), numContrib, netCharge, RgtrwTOF);
11631163
eventCandidatesSels(fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFT0A, fitInfo.timeFT0C, fitInfo.triggerMaskFT0,
11641164
fitInfo.ampFDDA, fitInfo.ampFDDC, fitInfo.timeFDDA, fitInfo.timeFDDC, fitInfo.triggerMaskFDD,
11651165
fitInfo.ampFV0A, fitInfo.timeFV0A, fitInfo.triggerMaskFV0A,
@@ -1379,7 +1379,7 @@ struct UpcCandProducer {
13791379
}
13801380
// store used tracks
13811381
fillFwdTracks(fwdTracks, trkCandIDs, candID, globalBC, closestBcMCH, mcFwdTrackLabels);
1382-
eventCandidates(globalBC, runNumber, dummyX, dummyY, dummyZ, numContrib, netCharge, RgtrwTOF);
1382+
eventCandidates(globalBC, runNumber, dummyX, dummyY, dummyZ, bcs.iteratorAt(0).flags(), numContrib, netCharge, RgtrwTOF);
13831383
eventCandidatesSels(fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFT0A, fitInfo.timeFT0C, fitInfo.triggerMaskFT0,
13841384
fitInfo.ampFDDA, fitInfo.ampFDDC, fitInfo.timeFDDA, fitInfo.timeFDDC, fitInfo.triggerMaskFDD,
13851385
fitInfo.ampFV0A, fitInfo.timeFV0A, fitInfo.triggerMaskFV0A,
@@ -1574,7 +1574,7 @@ struct UpcCandProducer {
15741574
}
15751575
// store used tracks
15761576
fillFwdTracks(fwdTracks, trkCandIDs, candID, globalBC, closestBcMCH, mcFwdTrackLabels);
1577-
eventCandidates(globalBC, runNumber, dummyX, dummyY, dummyZ, numContrib, netCharge, RgtrwTOF);
1577+
eventCandidates(globalBC, runNumber, dummyX, dummyY, dummyZ, bcs.iteratorAt(0).flags(), numContrib, netCharge, RgtrwTOF);
15781578
eventCandidatesSels(fitInfo.ampFT0A, fitInfo.ampFT0C, fitInfo.timeFT0A, fitInfo.timeFT0C, fitInfo.triggerMaskFT0,
15791579
fitInfo.ampFDDA, fitInfo.ampFDDC, fitInfo.timeFDDA, fitInfo.timeFDDC, fitInfo.triggerMaskFDD,
15801580
fitInfo.ampFV0A, fitInfo.timeFV0A, fitInfo.triggerMaskFV0A,

0 commit comments

Comments
 (0)