Skip to content

Commit fe5be41

Browse files
fgrosafgrosa
committed
Implement Vit's comments
1 parent 94e1d8d commit fe5be41

4 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎PWGHF/TableProducer/candidateCreator2Prong.cxx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct HfCandidateCreator2Prong {
6060
Configurable<float> centralityMax{"centralityMax", 100., "Maximum centrality"};
6161
// event selection
6262
Configurable<bool> useSel8Trigger{"useSel8Trigger", true, "apply the sel8 event selection"};
63-
Configurable<float> maxPvPosZ{"maxPvPosZ", 10.f, "max. PV posZ (cm)"};
63+
Configurable<float> zPvPosMax{"zPvPosMax", 10.f, "max. PV posZ (cm)"};
6464
Configurable<bool> useTimeFrameBorderCut{"useTimeFrameBorderCut", true, "apply TF border cut"};
6565
// vertexing
6666
Configurable<bool> constrainKfToPv{"constrainKfToPv", true, "constraint KFParticle to PV"};
@@ -185,7 +185,7 @@ struct HfCandidateCreator2Prong {
185185
/// reject candidates not satisfying the event selections
186186
auto collision = rowTrackIndexProng2.template collision_as<Coll>();
187187
float centrality{-1.f};
188-
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
188+
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
189189
if (rejectionMask != 0) {
190190
/// at least one event selection not satisfied --> reject the candidate
191191
continue;
@@ -315,7 +315,7 @@ struct HfCandidateCreator2Prong {
315315
/// reject candidates in collisions not satisfying the event selections
316316
auto collision = rowTrackIndexProng2.template collision_as<Coll>();
317317
float centrality{-1.f};
318-
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
318+
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
319319
if (rejectionMask != 0) {
320320
/// at least one event selection not satisfied --> reject the candidate
321321
continue;
@@ -596,7 +596,7 @@ struct HfCandidateCreator2Prong {
596596

597597
/// bitmask with event. selection info
598598
float centrality{-1.f};
599-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
599+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
600600

601601
/// monitor the satisfied event selections
602602
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
@@ -613,7 +613,7 @@ struct HfCandidateCreator2Prong {
613613

614614
/// bitmask with event. selection info
615615
float centrality{-1.f};
616-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
616+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
617617

618618
/// monitor the satisfied event selections
619619
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
@@ -630,7 +630,7 @@ struct HfCandidateCreator2Prong {
630630

631631
/// bitmask with event. selection info
632632
float centrality{-1.f};
633-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
633+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
634634

635635
/// monitor the satisfied event selections
636636
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);

‎PWGHF/TableProducer/candidateCreator3Prong.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct HfCandidateCreator3Prong {
4949
Configurable<float> centralityMax{"centralityMax", 100., "Maximum centrality"};
5050
// event selection
5151
Configurable<bool> useSel8Trigger{"useSel8Trigger", true, "apply the sel8 event selection"};
52-
Configurable<float> maxPvPosZ{"maxPvPosZ", 10.f, "max. PV posZ (cm)"};
52+
Configurable<float> zPvPosMax{"zPvPosMax", 10.f, "max. PV posZ (cm)"};
5353
Configurable<bool> useTimeFrameBorderCut{"useTimeFrameBorderCut", true, "apply TF border cut"};
5454
// vertexing
5555
Configurable<bool> propagateToPCA{"propagateToPCA", true, "create tracks version propagated to PCA"};
@@ -178,7 +178,7 @@ struct HfCandidateCreator3Prong {
178178
/// reject candidates in collisions not satisfying the event selections
179179
auto collision = rowTrackIndexProng3.template collision_as<Coll>();
180180
float centrality{-1.f};
181-
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
181+
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
182182
if (rejectionMask != 0) {
183183
/// at least one event selection not satisfied --> reject the candidate
184184
continue;
@@ -399,7 +399,7 @@ struct HfCandidateCreator3Prong {
399399

400400
/// bitmask with event. selection info
401401
float centrality{-1.f};
402-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
402+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
403403

404404
/// monitor the satisfied event selections
405405
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
@@ -416,7 +416,7 @@ struct HfCandidateCreator3Prong {
416416

417417
/// bitmask with event. selection info
418418
float centrality{-1.f};
419-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
419+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
420420

421421
/// monitor the satisfied event selections
422422
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
@@ -433,7 +433,7 @@ struct HfCandidateCreator3Prong {
433433

434434
/// bitmask with event. selection info
435435
float centrality{-1.f};
436-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
436+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
437437

438438
/// monitor the satisfied event selections
439439
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);

‎PWGHF/TableProducer/candidateCreatorCascade.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ struct HfCandidateCreatorCascade {
4747
Configurable<float> centralityMax{"centralityMax", 100., "Maximum centrality"};
4848
// event selection
4949
Configurable<bool> useSel8Trigger{"useSel8Trigger", true, "apply the sel8 event selection"};
50-
Configurable<float> maxPvPosZ{"maxPvPosZ", 10.f, "max. PV posZ (cm)"};
50+
Configurable<float> zPvPosMax{"zPvPosMax", 10.f, "max. PV posZ (cm)"};
5151
Configurable<bool> useTimeFrameBorderCut{"useTimeFrameBorderCut", true, "apply TF border cut"};
5252
// vertexing
5353
// Configurable<double> bz{"bz", 5., "magnetic field"};
@@ -157,7 +157,7 @@ struct HfCandidateCreatorCascade {
157157
/// reject candidates in collisions not satisfying the event selections
158158
auto collision = casc.template collision_as<Coll>();
159159
float centrality{-1.f};
160-
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
160+
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
161161
if (rejectionMask != 0) {
162162
/// at least one event selection not satisfied --> reject the candidate
163163
continue;
@@ -379,7 +379,7 @@ struct HfCandidateCreatorCascade {
379379

380380
/// bitmask with event. selection info
381381
float centrality{-1.f};
382-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
382+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
383383

384384
/// monitor the satisfied event selections
385385
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
@@ -396,7 +396,7 @@ struct HfCandidateCreatorCascade {
396396

397397
/// bitmask with event. selection info
398398
float centrality{-1.f};
399-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
399+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
400400

401401
/// monitor the satisfied event selections
402402
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
@@ -413,7 +413,7 @@ struct HfCandidateCreatorCascade {
413413

414414
/// bitmask with event. selection info
415415
float centrality{-1.f};
416-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
416+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
417417

418418
/// monitor the satisfied event selections
419419
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);

‎PWGHF/TableProducer/candidateCreatorDstar.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ struct HfCandidateCreatorDstar {
6262

6363
// event selection
6464
Configurable<bool> useSel8Trigger{"useSel8Trigger", true, "apply the sel8 event selection"};
65-
Configurable<float> maxPvPosZ{"maxPvPosZ", 10.f, "max. PV posZ (cm)"};
65+
Configurable<float> zPvPosMax{"zPvPosMax", 10.f, "max. PV posZ (cm)"};
6666
Configurable<bool> useTimeFrameBorderCut{"useTimeFrameBorderCut", true, "apply TF border cut"};
6767

6868
// vertexing
@@ -191,7 +191,7 @@ struct HfCandidateCreatorDstar {
191191
/// reject candidates in collisions not satisfying the event selections
192192
auto collision = rowTrackIndexDstar.template collision_as<Coll>();
193193
float centrality{-1.f};
194-
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
194+
const auto rejectionMask = getHfCollisionRejectionMask<true, centEstimator>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
195195
if (rejectionMask != 0) {
196196
/// at least one event selection not satisfied --> reject the candidate
197197
continue;
@@ -447,7 +447,7 @@ struct HfCandidateCreatorDstar {
447447

448448
/// bitmask with event. selection info
449449
float centrality{-1.f};
450-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
450+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::None>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
451451

452452
/// monitor the satisfied event selections
453453
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
@@ -464,7 +464,7 @@ struct HfCandidateCreatorDstar {
464464

465465
/// bitmask with event. selection info
466466
float centrality{-1.f};
467-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
467+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0C>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
468468

469469
/// monitor the satisfied event selections
470470
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);
@@ -481,7 +481,7 @@ struct HfCandidateCreatorDstar {
481481

482482
/// bitmask with event. selection info
483483
float centrality{-1.f};
484-
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -maxPvPosZ, maxPvPosZ, 0, -1.f);
484+
const auto rejectionMask = getHfCollisionRejectionMask<true, CentralityEstimator::FT0M>(collision, centrality, centralityMin, centralityMax, useSel8Trigger, -1, useTimeFrameBorderCut, -zPvPosMax, zPvPosMax, 0, -1.f);
485485

486486
/// monitor the satisfied event selections
487487
monitorCollision(collision, rejectionMask, hCollisions, hPosZBeforeEvSel, hPosZAfterEvSel, hPosXAfterEvSel, hPosYAfterEvSel, hNumPvContributorsAfterSel);

0 commit comments

Comments
 (0)