Skip to content

Commit 84ae96d

Browse files
rolavickrolavick
committed
fix
1 parent 0b9e6df commit 84ae96d

3 files changed

Lines changed: 30 additions & 81 deletions

File tree

‎PWGUD/TableProducer/DGCandProducer.cxx‎

Lines changed: 10 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -283,39 +283,14 @@ struct DGCandProducer {
283283
LOGF(debug, "<DGCandProducer> BC id %d", bc.globalBC());
284284
const uint64_t ts = bc.timestamp();
285285
const int runnumber = bc.runNumber();
286-
287-
int tfb = 0;
288-
if (collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
289-
tfb = 1;
290-
}
291-
int itsROFb = 0;
292-
if (collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
293-
itsROFb = 1;
294-
}
295-
int sbp = 0;
296-
if (collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) {
297-
sbp = 1;
298-
}
299-
int zVtxFT0vPv = 0;
300-
if (collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) {
301-
zVtxFT0vPv = 1;
302-
}
303-
int vtxITSTPC = 0;
304-
if (collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC)) {
305-
vtxITSTPC = 1;
306-
}
307-
int trs = 0;
308-
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard)) {
309-
trs = 1;
310-
}
311-
int trofs = 0;
312-
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard)) {
313-
trofs = 1;
314-
}
315-
int hmpr = 0;
316-
if (collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof)) {
317-
hmpr = 1;
318-
}
286+
int trs = collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard) ? 1 : 0;
287+
int trofs = collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard) ? 1 : 0;
288+
int hmpr = collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof) ? 1 : 0;
289+
int tfb = collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) ? 1 : 0;
290+
int itsROFb = collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder) ? 1 : 0;
291+
int sbp = collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup) ? 1 : 0;
292+
int zVtxFT0vPv = collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV) ? 1 : 0;
293+
int vtxITSTPC = collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC) ? 1 : 0;
319294
double ir = 0.;
320295
if (bc.has_zdc()) {
321296
ir = mRateFetcher.fetch(ccdb.service, ts, runnumber, "ZNC hadronic") * 1.e-3;
@@ -325,8 +300,7 @@ struct DGCandProducer {
325300
uint8_t chFDDA = 0;
326301
uint8_t chFDDC = 0;
327302
uint8_t chFV0A = 0;
328-
int occ = 0;
329-
occ = collision.trackOccupancyInTimeRange();
303+
int occ = collision.trackOccupancyInTimeRange();
330304

331305
if (cfgSkimmedProcessing) {
332306
// update ccdb setting for zorro
@@ -367,10 +341,7 @@ struct DGCandProducer {
367341

368342
// update DG candidates tables
369343
auto rtrwTOF = udhelpers::rPVtrwTOF<true>(tracks, collision.numContrib());
370-
int upc_flag = 0;
371-
ushort flags = collision.flags();
372-
if (flags & dataformats::Vertex<o2::dataformats::TimeStamp<int>>::Flags::UPCMode)
373-
upc_flag = 1;
344+
int upc_flag = (collision.flags() & dataformats::Vertex<o2::dataformats::TimeStamp<int>>::Flags::UPCMode) ? 1 : 0;
374345
outputCollisions(bc.globalBC(), bc.runNumber(),
375346
collision.posX(), collision.posY(), collision.posZ(), upc_flag,
376347
collision.numContrib(), udhelpers::netCharge<true>(tracks),

‎PWGUD/TableProducer/SGCandProducer.cxx‎

Lines changed: 10 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -193,64 +193,40 @@ struct SGCandProducer {
193193
if (rejectAtTFBoundary && !collision.selection_bit(aod::evsel::kNoTimeFrameBorder)) {
194194
return;
195195
}
196-
int tfb = 0;
197-
if (collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder)) {
198-
tfb = 1;
199-
}
200196
getHist(TH1, histdir + "/Stat")->Fill(1., 1.);
201197
// reject collisions at ITS RO TF boundaries
202198
if (noITSROFrameBorder && !collision.selection_bit(aod::evsel::kNoITSROFrameBorder)) {
203199
return;
204200
}
205-
int itsROFb = 0;
206-
if (collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder)) {
207-
itsROFb = 1;
208-
}
209201
getHist(TH1, histdir + "/Stat")->Fill(2., 1.);
210202
// reject Same Bunch PileUp
211203
if (noSameBunchPileUp && !collision.selection_bit(aod::evsel::kNoSameBunchPileup)) {
212204
return;
213205
}
214-
int sbp = 0;
215-
if (collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) {
216-
sbp = 1;
217-
}
218206
getHist(TH1, histdir + "/Stat")->Fill(3., 1.);
219207
// check vertex matching to FT0
220208
if (IsGoodVertex && !collision.selection_bit(aod::evsel::kIsGoodZvtxFT0vsPV)) {
221209
return;
222210
}
223-
int zVtxFT0vPv = 0;
224-
if (collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) {
225-
zVtxFT0vPv = 1;
226-
}
227211
getHist(TH1, histdir + "/Stat")->Fill(4., 1.);
228212
// reject ITS Only vertices
229213
if (ITSTPCVertex && !collision.selection_bit(aod::evsel::kIsVertexITSTPC)) {
230214
return;
231215
}
232-
int vtxITSTPC = 0;
233-
if (collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC)) {
234-
vtxITSTPC = 1;
235-
}
236216
getHist(TH1, histdir + "/Stat")->Fill(5., 1.);
237217
// nominal BC
238218
if (!collision.has_foundBC()) {
239219
return;
240220
}
241221
getHist(TH1, histdir + "/Stat")->Fill(6., 1.);
242-
int trs = 0;
243-
if (collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard)) {
244-
trs = 1;
245-
}
246-
int trofs = 0;
247-
if (collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard)) {
248-
trofs = 1;
249-
}
250-
int hmpr = 0;
251-
if (collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof)) {
252-
hmpr = 1;
253-
}
222+
int trs = collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard) ? 1 : 0;
223+
int trofs = collision.selection_bit(o2::aod::evsel::kNoCollInRofStandard) ? 1 : 0;
224+
int hmpr = collision.selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof) ? 1 : 0;
225+
int tfb = collision.selection_bit(o2::aod::evsel::kNoTimeFrameBorder) ? 1 : 0;
226+
int itsROFb = collision.selection_bit(o2::aod::evsel::kNoITSROFrameBorder) ? 1 : 0;
227+
int sbp = collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup) ? 1 : 0;
228+
int zVtxFT0vPv = collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV) ? 1 : 0;
229+
int vtxITSTPC = collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC) ? 1 : 0;
254230
auto bc = collision.template foundBC_as<BCs>();
255231
double ir = 0.;
256232
const uint64_t ts = bc.timestamp();
@@ -285,14 +261,10 @@ struct SGCandProducer {
285261
uint8_t chFDDA = 0;
286262
uint8_t chFDDC = 0;
287263
uint8_t chFV0A = 0;
288-
int occ = 0;
289-
occ = collision.trackOccupancyInTimeRange();
264+
int occ = collision.trackOccupancyInTimeRange();
290265
udhelpers::getFITinfo(fitInfo, newbc, bcs, ft0s, fv0as, fdds);
266+
int upc_flag = (collision.flags() & dataformats::Vertex<o2::dataformats::TimeStamp<int>>::Flags::UPCMode) ? 1 : 0;
291267
// update SG candidates tables
292-
int upc_flag = 0;
293-
ushort flags = collision.flags();
294-
if (flags & dataformats::Vertex<o2::dataformats::TimeStamp<int>>::Flags::UPCMode)
295-
upc_flag = 1;
296268
outputCollisions(bc.globalBC(), bc.runNumber(),
297269
collision.posX(), collision.posY(), collision.posZ(), upc_flag,
298270
collision.numContrib(), udhelpers::netCharge<true>(tracks),

‎PWGUD/TableProducer/UPCCandidateProducer.cxx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1836,10 +1836,16 @@ struct UpcCandProducer {
18361836
fitInfo.BBFV0Apf, fitInfo.BGFV0Apf,
18371837
fitInfo.BBFDDApf, fitInfo.BBFDDCpf, fitInfo.BGFDDApf, fitInfo.BGFDDCpf);
18381838
// get selection flags per BC
1839-
int trsVal = bcTRS.count(globalBC) ? bcTRS[globalBC] : 0;
1840-
int trofsVal = bcTROFS.count(globalBC) ? bcTROFS[globalBC] : 0;
1841-
int hmprVal = bcHMPR.count(globalBC) ? bcHMPR[globalBC] : 0;
1842-
eventCandidatesSelExtras(chFT0A, chFT0C, chFDDA, chFDDC, chFV0A, 0, 0, trsVal, trofsVal, hmprVal);
1839+
int trs = ft0.bc_as<TBCs>().selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard) ? 1 : 0;
1840+
int trofs = ft0.bc_as<TBCs>().selection_bit(o2::aod::evsel::kNoCollInRofStandard) ? 1 : 0;
1841+
int hmpr = ft0.bc_as<TBCs>().selection_bit(o2::aod::evsel::kNoHighMultCollInPrevRof) ? 1 : 0;
1842+
int tfb = ft0.bc_as<TBCs>().selection_bit(o2::aod::evsel::kNoTimeFrameBorder) ? 1 : 0;
1843+
int itsROFb = ft0.bc_as<TBCs>().selection_bit(o2::aod::evsel::kNoITSROFrameBorder) ? 1 : 0;
1844+
int sbp = ft0.bc_as<TBCs>().selection_bit(o2::aod::evsel::kNoSameBunchPileup) ? 1 : 0;
1845+
int zVtxFT0vPv = ft0.bc_as<TBCs>().selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV) ? 1 : 0;
1846+
int vtxITSTPC = ft0.bc_as<TBCs>().selection_bit(o2::aod::evsel::kIsVertexITSTPC) ? 1 : 0;
1847+
1848+
eventCandidatesSelExtras(chFT0A, chFT0C, chFDDA, chFDDC, chFV0A, 0, 0, trs, trofs, tfb, tfb, itsROFb, sbp, zVtxFT0vPv, vtxITSTPC);
18431849
eventCandidatesSelsFwd(fitInfo.distClosestBcV0A,
18441850
fitInfo.distClosestBcT0A,
18451851
amplitudesT0A,

0 commit comments

Comments
 (0)