Skip to content

Commit 6308e38

Browse files
morgmattmorgmatt
committed
Merge branch 'sigma-minus-bis' of github.com:morgmatt/O2Physics into sigma-minus-bis
2 parents 32cf521 + 69b1f96 commit 6308e38

File tree

1 file changed

+39
-40
lines changed

1 file changed

+39
-40
lines changed

‎PWGLF/TableProducer/Strangeness/sigmaminustask.cxx‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ struct sigmaminustask {
8383

8484
// Runtime variables
8585
int mRunNumber = 0;
86-
float mBz = 0.0f;
86+
float mBz = 0.0f;
8787
o2::base::MatLayerCylSet* matLUT = nullptr;
8888

8989
void init(InitContext const&)
@@ -157,15 +157,15 @@ struct sigmaminustask {
157157
auto h2MCRadiusFilterIndex = rFindable.get<TH2>(HIST("h2MCRadiusFilterIndex"));
158158
auto h2RecRadiusFilterIndex = rFindable.get<TH2>(HIST("h2RecRadiusFilterIndex"));
159159
for (size_t i = 0; i < filterLabels.size(); ++i) {
160-
hFilterIndex->GetXaxis()->SetBinLabel(i + 1, filterLabels[i].c_str());
161-
h2MCRadiusFilterIndex->GetXaxis()->SetBinLabel(i + 1, filterLabels[i].c_str());
162-
h2RecRadiusFilterIndex->GetXaxis()->SetBinLabel(i + 1, filterLabels[i].c_str());
160+
hFilterIndex->GetXaxis()->SetBinLabel(i + 1, filterLabels[i].c_str());
161+
h2MCRadiusFilterIndex->GetXaxis()->SetBinLabel(i + 1, filterLabels[i].c_str());
162+
h2RecRadiusFilterIndex->GetXaxis()->SetBinLabel(i + 1, filterLabels[i].c_str());
163163
}
164164

165165
rFindable.add("h2MCRadiusFilter_plus_protonkink", "h2MCRadiusFilter_plus_protonkink", {HistType::kTH2F, {filtersAxis, radiusAxis}});
166166
rFindable.add("h2MCRadiusFilter_plus_pikink", "h2MCRadiusFilter_plus_pikink", {HistType::kTH2F, {filtersAxis, radiusAxis}});
167167
rFindable.add("h2MCRadiusFilter_minus_pikink", "h2MCRadiusFilter_minus_pikink", {HistType::kTH2F, {filtersAxis, radiusAxis}});
168-
168+
169169
rFindable.add("h2PtFilter_plus_protonkink", "h2PtFilter_plus_protonkink", {HistType::kTH2F, {filtersAxis, ptUnsignedAxis}});
170170
rFindable.add("h2PtFilter_plus_pikink", "h2PtFilter_plus_pikink", {HistType::kTH2F, {filtersAxis, ptUnsignedAxis}});
171171
rFindable.add("h2PtFilter_minus_pikink", "h2PtFilter_minus_pikink", {HistType::kTH2F, {filtersAxis, ptUnsignedAxis}});
@@ -252,7 +252,7 @@ struct sigmaminustask {
252252
}
253253
PROCESS_SWITCH(sigmaminustask, processData, "Data processing", true);
254254

255-
void processMC(CollisionsFullMC const& collisions, aod::KinkCands const& KinkCands, aod::McTrackLabels const& trackLabelsMC, aod::McParticles const& particlesMC, TracksFull const&, aod::McCollisions const&)
255+
void processMC(CollisionsFullMC const& collisions, aod::KinkCands const& KinkCands, aod::McTrackLabels const& trackLabelsMC, aod::McParticles const& particlesMC, TracksFull const&, aod::McCollisions const&)
256256
{
257257
for (const auto& collision : collisions) {
258258
if (std::abs(collision.posZ()) > cutzvertex || !collision.sel8()) {
@@ -313,7 +313,7 @@ struct sigmaminustask {
313313
}
314314
// Check bunch crossing ID coherence
315315
auto mcCollision = mcTrackPiDau.template mcCollision_as<aod::McCollisions>();
316-
//bool BCId_vs_MCBCId = collision.bcId() == mcCollision.bcId();
316+
// bool BCId_vs_MCBCId = collision.bcId() == mcCollision.bcId();
317317
bool BCId_vs_EvSel = collision.bcId() == collision.foundBCId();
318318
bool EvSel_vs_MCBCId = collision.foundBCId() == mcCollision.bcId();
319319

@@ -396,12 +396,12 @@ struct sigmaminustask {
396396
}
397397
PROCESS_SWITCH(sigmaminustask, processMC, "MC processing", false);
398398

399-
void fillFindableHistograms(int filterIndex, float mcRadius, float recRadius, float ptMoth, float ptDaug, bool isSigmaMinus, bool isPiDaughter)
399+
void fillFindableHistograms(int filterIndex, float mcRadius, float recRadius, float ptMoth, float ptDaug, bool isSigmaMinus, bool isPiDaughter)
400400
{
401401
rFindable.fill(HIST("hFilterIndex"), filterIndex);
402402
rFindable.fill(HIST("h2MCRadiusFilterIndex"), filterIndex, mcRadius);
403403
rFindable.fill(HIST("h2RecRadiusFilterIndex"), filterIndex, recRadius);
404-
404+
405405
if (isPiDaughter) {
406406
if (isSigmaMinus) {
407407
rFindable.fill(HIST("h2MCRadiusFilter_minus_pikink"), filterIndex, mcRadius);
@@ -414,15 +414,15 @@ struct sigmaminustask {
414414
}
415415
} else {
416416
if (!isSigmaMinus) {
417-
rFindable.fill(HIST("h2MCRadiusFilter_plus_protonkink"), filterIndex, mcRadius);
418-
rFindable.fill(HIST("h2PtFilter_plus_protonkink"), filterIndex, ptMoth);
419-
rFindable.fill(HIST("h2PtDaugFilter_plus_protonkink"), filterIndex, ptDaug);
417+
rFindable.fill(HIST("h2MCRadiusFilter_plus_protonkink"), filterIndex, mcRadius);
418+
rFindable.fill(HIST("h2PtFilter_plus_protonkink"), filterIndex, ptMoth);
419+
rFindable.fill(HIST("h2PtDaugFilter_plus_protonkink"), filterIndex, ptDaug);
420420
}
421421
}
422422
}
423423

424-
void processFindable(aod::KinkCands const& kinkCands, aod::McTrackLabels const& trackLabelsMC,
425-
TracksFull const& tracks, aod::McParticles const&, CollisionsFullMC const&, aod::BCs const&)
424+
void processFindable(aod::KinkCands const& kinkCands, aod::McTrackLabels const& trackLabelsMC,
425+
TracksFull const& tracks, aod::McParticles const&, CollisionsFullMC const&, aod::BCs const&)
426426
{
427427
// A - generated findable track pairs map: mcMother.globalIndex() -> (motherTrack.globalIndex(), daughterTrack.globalIndex())
428428
std::unordered_map<int64_t, std::pair<int64_t, int64_t>> allCandsIndices;
@@ -436,7 +436,7 @@ struct sigmaminustask {
436436

437437
if (mcParticle.has_daughters() && (std::abs(mcParticle.pdgCode()) == 3112 || std::abs(mcParticle.pdgCode()) == 3222)) {
438438
allCandsIndices[mcParticle.globalIndex()] = {track.globalIndex(), -1};
439-
}
439+
}
440440
}
441441

442442
for (const auto& track : tracks) {
@@ -472,26 +472,25 @@ struct sigmaminustask {
472472
auto mcDaughter = mcLabDaug.mcParticle_as<aod::McParticles>();
473473

474474
if (std::abs(mcMother.pdgCode()) != 3112 && std::abs(mcMother.pdgCode()) != 3222) {
475-
continue;
475+
continue;
476476
}
477477
if (std::abs(mcDaughter.pdgCode()) != 211 && std::abs(mcDaughter.pdgCode()) != 2212) {
478-
continue;
478+
continue;
479479
}
480480

481481
auto findableIt = allCandsIndices.find(mcMother.globalIndex());
482-
if (findableIt != allCandsIndices.end() &&
483-
findableIt->second.first == motherTrack.globalIndex() &&
484-
findableIt->second.second == daughterTrack.globalIndex()) {
482+
if (findableIt != allCandsIndices.end() &&
483+
findableIt->second.first == motherTrack.globalIndex() &&
484+
findableIt->second.second == daughterTrack.globalIndex()) {
485485

486486
findableToKinkCand[mcMother.globalIndex()] = kinkCand.globalIndex();
487487
}
488488
}
489489

490-
491490
// C - loop on valid pairs for findable analysis
492491
for (const auto& [mcMotherIndex, trackIndices] : allCandsIndices) {
493492
if (trackIndices.second == -1 || trackIndices.first == -1) {
494-
continue;
493+
continue;
495494
}
496495

497496
// Retrieve mother and daughter tracks and mcParticles
@@ -514,14 +513,14 @@ struct sigmaminustask {
514513
auto kinkCand = kinkCands.rawIteratorAt(findableToKinkCand[mcMother.globalIndex()]);
515514
recRadius = std::sqrt(kinkCand.xDecVtx() * kinkCand.xDecVtx() + kinkCand.yDecVtx() * kinkCand.yDecVtx());
516515
}
517-
516+
518517
// Check for detector mismatches in ITS mother tracks
519518
auto mask_value = mcLabMoth.mcMask();
520519
int mismatchITS_index = -1;
521-
522-
for (int i = 0; i < 7; ++i) { // ITS has layers 0-6, bit ON means mismatch
520+
521+
for (int i = 0; i < 7; ++i) { // ITS has layers 0-6, bit ON means mismatch
523522
if ((mask_value & (1 << i)) != 0) {
524-
mismatchITS_index = i;
523+
mismatchITS_index = i;
525524
break;
526525
}
527526
}
@@ -530,51 +529,51 @@ struct sigmaminustask {
530529
int filterIndex = 0;
531530
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
532531

533-
// 1 - tracks with right ITS, TPC, TOF signals
532+
// 1 - tracks with right ITS, TPC, TOF signals
534533
if (motherTrack.has_collision() && motherTrack.hasITS() && !motherTrack.hasTPC() && !motherTrack.hasTOF() &&
535534
daughterTrack.hasITS() && daughterTrack.hasTPC()) {
536535
filterIndex += 1;
537536
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
538537
rFindable.fill(HIST("hfakeITSfindable"), mismatchITS_index);
539538
} else {
540-
continue;
539+
continue;
541540
}
542-
543-
// 2 - moth+daug track quality cuts
541+
542+
// 2 - moth+daug track quality cuts
544543
bool motherGoodITS = motherTrack.hasITS() && motherTrack.itsNCls() < 6 && motherTrack.itsNClsInnerBarrel() == 3 && motherTrack.itsChi2NCl() < 36;
545544
bool daughterGoodITSTPC = daughterTrack.hasITS() && daughterTrack.hasTPC() && daughterTrack.itsNClsInnerBarrel() == 0 &&
546-
daughterTrack.itsNCls() < 4 && daughterTrack.tpcNClsCrossedRows() > 0.8 * daughterTrack.tpcNClsFindable() && daughterTrack.tpcNClsFound() > nTPCClusMinDaugKB;
545+
daughterTrack.itsNCls() < 4 && daughterTrack.tpcNClsCrossedRows() > 0.8 * daughterTrack.tpcNClsFindable() && daughterTrack.tpcNClsFound() > nTPCClusMinDaugKB;
547546
if (motherGoodITS && daughterGoodITSTPC) {
548547
filterIndex += 1;
549548
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
550549
} else {
551-
continue;
550+
continue;
552551
}
553552

554553
// 3 - mother track min pT
555554
if (motherTrack.pt() > minPtMothKB) {
556555
filterIndex += 1;
557556
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
558557
} else {
559-
continue;
558+
continue;
560559
}
561560

562561
// 4 - geometric cuts: eta
563562
if (std::abs(motherTrack.eta()) < etaMaxKB && std::abs(daughterTrack.eta()) < etaMaxKB) {
564563
filterIndex += 1;
565564
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
566565
} else {
567-
continue;
566+
continue;
568567
}
569568

570569
// 5 - geometric cuts: phi difference
571570
if (std::abs(motherTrack.phi() - daughterTrack.phi()) * radToDeg < maxPhiDiffKB) {
572571
filterIndex += 1;
573572
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
574573
} else {
575-
continue;
574+
continue;
576575
}
577-
576+
578577
// DCA calculation: initialization CCDB
579578
auto collision = motherTrack.template collision_as<CollisionsFullMC>();
580579
auto bc = collision.template bc_as<aod::BCs>();
@@ -611,31 +610,31 @@ struct sigmaminustask {
611610
filterIndex += 1;
612611
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
613612
} else {
614-
continue;
613+
continue;
615614
}
616615

617616
// 8 - DCA daughter
618617
if (dcaXYDaughter > minDcaDaugPvKB) {
619618
filterIndex += 1;
620619
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
621620
} else {
622-
continue;
621+
continue;
623622
}
624623

625624
// 9 - radius cut
626625
if (recRadius > radiusCutKB) {
627626
filterIndex += 1;
628627
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
629628
} else {
630-
continue;
629+
continue;
631630
}
632631

633632
// 10 - collision selection
634633
if (!(std::abs(collision.posZ()) > cutzvertex || !collision.sel8())) {
635634
filterIndex += 1;
636635
fillFindableHistograms(filterIndex, mcRadius, recRadius, recPtMother, recPtDaughter, isSigmaMinus, isPiDaughter);
637636
} else {
638-
continue;
637+
continue;
639638
}
640639

641640
// 11 - TOF daughter presence

0 commit comments

Comments
 (0)