Skip to content

Commit c8c59a1

Browse files
author
Mattia Faggin
committed
Address comments.
1 parent de6598a commit c8c59a1

6 files changed

Lines changed: 86 additions & 109 deletions

File tree

‎PWGHF/TableProducer/candidateCreator2Prong.cxx‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
4141
#include "PWGHF/Utils/utilsBfieldCCDB.h"
4242
#include "PWGHF/Utils/utilsEvSelHf.h"
43-
#include "PWGHF/Utils/utilsMonitorCollisions.h"
4443

4544
using namespace o2;
4645
using namespace o2::analysis;
@@ -166,7 +165,7 @@ struct HfCandidateCreator2Prong {
166165
hCollisions->GetXaxis()->SetBinLabel(5, "Centrality + sel8 + posZ + TF border ok");
167166
}
168167

169-
template <bool doPvRefit, int centEstimator, typename Coll, typename CandType, typename TTracks>
168+
template <bool doPvRefit, o2::aod::hf_collision_centrality::CentralityEstimator centEstimator, typename Coll, typename CandType, typename TTracks>
170169
void runCreator2ProngWithDCAFitterN(Coll const& collisions,
171170
CandType const& rowsTrackIndexProng2,
172171
TTracks const& tracks,
@@ -177,8 +176,8 @@ struct HfCandidateCreator2Prong {
177176

178177
/// reject candidates not satisfying the event selections
179178
auto collision = rowTrackIndexProng2.template collision_as<Coll>();
180-
const uint16_t statusCollision = isHfCollisionSelected<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
181-
if (statusCollision != 0) {
179+
const uint16_t rejectionMask = getHfCollisionRejectionMask<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
180+
if (rejectionMask != 0) {
182181
/// at least one event selection not satisfied --> reject the candidate
183182
continue;
184183
}
@@ -295,7 +294,7 @@ struct HfCandidateCreator2Prong {
295294
}
296295
}
297296

298-
template <bool doPvRefit, int centEstimator, typename Coll, typename CandType, typename TTracks>
297+
template <bool doPvRefit, o2::aod::hf_collision_centrality::CentralityEstimator centEstimator, typename Coll, typename CandType, typename TTracks>
299298
void runCreator2ProngWithKFParticle(Coll const& collisions,
300299
CandType const& rowsTrackIndexProng2,
301300
TTracks const& tracks,
@@ -306,8 +305,8 @@ struct HfCandidateCreator2Prong {
306305

307306
/// reject candidates in collisions not satisfying the event selections
308307
auto collision = rowTrackIndexProng2.template collision_as<Coll>();
309-
const uint16_t statusCollision = isHfCollisionSelected<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
310-
if (statusCollision != 0) {
308+
const uint16_t rejectionMask = getHfCollisionRejectionMask<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
309+
if (rejectionMask != 0) {
311310
/// at least one event selection not satisfied --> reject the candidate
312311
continue;
313312
}
@@ -585,10 +584,10 @@ struct HfCandidateCreator2Prong {
585584
for (const auto& collision : collisions) {
586585

587586
/// bitmask with event. selection info
588-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::None>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
587+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::None>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
589588

590589
/// monitor the satisfied event selections
591-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
590+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
592591

593592
} /// end loop over collisions
594593
}
@@ -601,10 +600,10 @@ struct HfCandidateCreator2Prong {
601600
for (const auto& collision : collisions) {
602601

603602
/// bitmask with event. selection info
604-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::FT0C>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
603+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::FT0C>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
605604

606605
/// monitor the satisfied event selections
607-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
606+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
608607

609608
} /// end loop over collisions
610609
}
@@ -617,10 +616,10 @@ struct HfCandidateCreator2Prong {
617616
for (const auto& collision : collisions) {
618617

619618
/// bitmask with event. selection info
620-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::FT0M>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
619+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::FT0M>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
621620

622621
/// monitor the satisfied event selections
623-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
622+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
624623

625624
} /// end loop over collisions
626625
}

‎PWGHF/TableProducer/candidateCreator3Prong.cxx‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
3030
#include "PWGHF/Utils/utilsBfieldCCDB.h"
3131
#include "PWGHF/Utils/utilsEvSelHf.h"
32-
#include "PWGHF/Utils/utilsMonitorCollisions.h"
3332

3433
using namespace o2;
3534
using namespace o2::analysis;
@@ -159,7 +158,7 @@ struct HfCandidateCreator3Prong {
159158
hCollisions->GetXaxis()->SetBinLabel(5, "Centrality + sel8 + posZ + TF border ok");
160159
}
161160

162-
template <bool doPvRefit = false, int centEstimator = 0, typename Coll, typename Cand>
161+
template <bool doPvRefit = false, o2::aod::hf_collision_centrality::CentralityEstimator centEstimator = 0, typename Coll, typename Cand>
163162
void runCreator3Prong(Coll const& collisions,
164163
Cand const& rowsTrackIndexProng3,
165164
aod::TracksWCovExtra const& tracks,
@@ -170,8 +169,8 @@ struct HfCandidateCreator3Prong {
170169

171170
/// reject candidates in collisions not satisfying the event selections
172171
auto collision = rowTrackIndexProng3.template collision_as<Coll>();
173-
uint16_t statusCollision = isHfCollisionSelected<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
174-
if (statusCollision != 0) {
172+
uint16_t rejectionMask = getHfCollisionRejectionMask<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
173+
if (rejectionMask != 0) {
175174
/// at least one event selection not satisfied --> reject the candidate
176175
continue;
177176
}
@@ -390,10 +389,10 @@ struct HfCandidateCreator3Prong {
390389
for (const auto& collision : collisions) {
391390

392391
/// bitmask with event. selection info
393-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::None>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
392+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::None>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
394393

395394
/// monitor the satisfied event selections
396-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
395+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
397396

398397
} /// end loop over collisions
399398
}
@@ -406,10 +405,10 @@ struct HfCandidateCreator3Prong {
406405
for (const auto& collision : collisions) {
407406

408407
/// bitmask with event. selection info
409-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::FT0C>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
408+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::FT0C>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
410409

411410
/// monitor the satisfied event selections
412-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
411+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
413412

414413
} /// end loop over collisions
415414
}
@@ -422,10 +421,10 @@ struct HfCandidateCreator3Prong {
422421
for (const auto& collision : collisions) {
423422

424423
/// bitmask with event. selection info
425-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::FT0M>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
424+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::FT0M>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
426425

427426
/// monitor the satisfied event selections
428-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
427+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
429428

430429
} /// end loop over collisions
431430
}

‎PWGHF/TableProducer/candidateCreatorCascade.cxx‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
3030
#include "PWGHF/Utils/utilsBfieldCCDB.h"
3131
#include "PWGHF/Utils/utilsEvSelHf.h"
32-
#include "PWGHF/Utils/utilsMonitorCollisions.h"
3332

3433
using namespace o2;
3534
using namespace o2::analysis;
@@ -135,7 +134,7 @@ struct HfCandidateCreatorCascade {
135134
hCollisions->GetXaxis()->SetBinLabel(5, "Centrality + sel8 + posZ + TF border ok");
136135
}
137136

138-
template <int centEstimator, typename Coll>
137+
template <o2::aod::hf_collision_centrality::CentralityEstimator centEstimator, typename Coll>
139138
void runCreatorCascade(Coll const&,
140139
aod::HfCascades const& rowsTrackIndexCasc,
141140
aod::V0sLinked const&,
@@ -149,8 +148,8 @@ struct HfCandidateCreatorCascade {
149148

150149
/// reject candidates in collisions not satisfying the event selections
151150
auto collision = casc.template collision_as<Coll>();
152-
const uint16_t statusCollision = isHfCollisionSelected<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
153-
if (statusCollision != 0) {
151+
const uint16_t rejectionMask = getHfCollisionRejectionMask<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
152+
if (rejectionMask != 0) {
154153
/// at least one event selection not satisfied --> reject the candidate
155154
continue;
156155
}
@@ -370,10 +369,10 @@ struct HfCandidateCreatorCascade {
370369
for (const auto& collision : collisions) {
371370

372371
/// bitmask with event. selection info
373-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::None>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
372+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::None>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
374373

375374
/// monitor the satisfied event selections
376-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
375+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
377376

378377
} /// end loop over collisions
379378
}
@@ -386,10 +385,10 @@ struct HfCandidateCreatorCascade {
386385
for (const auto& collision : collisions) {
387386

388387
/// bitmask with event. selection info
389-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::FT0C>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
388+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::FT0C>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
390389

391390
/// monitor the satisfied event selections
392-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
391+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
393392

394393
} /// end loop over collisions
395394
}
@@ -402,10 +401,10 @@ struct HfCandidateCreatorCascade {
402401
for (const auto& collision : collisions) {
403402

404403
/// bitmask with event. selection info
405-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::FT0M>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
404+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::FT0M>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
406405

407406
/// monitor the satisfied event selections
408-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
407+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
409408

410409
} /// end loop over collisions
411410
}

‎PWGHF/TableProducer/candidateCreatorDstar.cxx‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "PWGHF/DataModel/CandidateReconstructionTables.h"
3131
#include "PWGHF/Utils/utilsBfieldCCDB.h"
3232
#include "PWGHF/Utils/utilsEvSelHf.h"
33-
#include "PWGHF/Utils/utilsMonitorCollisions.h"
3433

3534
using namespace o2;
3635
using namespace o2::aod::hf_collision_centrality;
@@ -172,7 +171,7 @@ struct HfCandidateCreatorDstar {
172171
/// @param rowsTrackIndexD0 D0 table object from trackIndexSkimCreator.cxx
173172
/// @param tracks track table with Cov object
174173
/// @param bcWithTimeStamps Bunch Crossing with timestamps
175-
template <bool doPvRefit, int centEstimator, typename Coll, typename CandsDstar>
174+
template <bool doPvRefit, o2::aod::hf_collision_centrality::CentralityEstimator centEstimator, typename Coll, typename CandsDstar>
176175
void runCreatorDstar(Coll const& collisions,
177176
CandsDstar const& rowsTrackIndexDstar,
178177
aod::Hf2Prongs const& rowsTrackIndexD0,
@@ -186,8 +185,8 @@ struct HfCandidateCreatorDstar {
186185

187186
/// reject candidates in collisions not satisfying the event selections
188187
auto collision = rowTrackIndexDstar.template collision_as<Coll>();
189-
const uint16_t statusCollision = isHfCollisionSelected<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
190-
if (statusCollision != 0) {
188+
const uint16_t rejectionMask = getHfCollisionRejectionMask<centEstimator>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
189+
if (rejectionMask != 0) {
191190
/// at least one event selection not satisfied --> reject the candidate
192191
continue;
193192
}
@@ -441,10 +440,10 @@ struct HfCandidateCreatorDstar {
441440
for (const auto& collision : collisions) {
442441

443442
/// bitmask with event. selection info
444-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::None>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
443+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::None>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
445444

446445
/// monitor the satisfied event selections
447-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
446+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
448447

449448
} /// end loop over collisions
450449
}
@@ -457,10 +456,10 @@ struct HfCandidateCreatorDstar {
457456
for (const auto& collision : collisions) {
458457

459458
/// bitmask with event. selection info
460-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::FT0C>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
459+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::FT0C>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
461460

462461
/// monitor the satisfied event selections
463-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
462+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
464463

465464
} /// end loop over collisions
466465
}
@@ -473,10 +472,10 @@ struct HfCandidateCreatorDstar {
473472
for (const auto& collision : collisions) {
474473

475474
/// bitmask with event. selection info
476-
const uint16_t statusCollision = isHfCollisionSelected<CentralityEstimator::FT0M>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
475+
const uint16_t rejectionMask = getHfCollisionRejectionMask<CentralityEstimator::FT0M>(collision, std::array<float, 2>{centralityMin.value, centralityMax.value}, useSel8Trigger, maxPvPosZ, useTimeFrameBorderCut);
477476

478477
/// monitor the satisfied event selections
479-
monitorCollision(collision, statusCollision, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
478+
monitorCollision(collision, rejectionMask, hCollisions.object, hPosZBeforeEvSel.object, hPosZAfterEvSel.object);
480479

481480
} /// end loop over collisions
482481
}

0 commit comments

Comments
 (0)