Skip to content

Commit da7db79

Browse files
gianniliverarogianniliveraro
authored
Merge pull request #27 from alibuild/alibot-cleanup-11216
Please consider the following formatting changes to #11216
2 parents e6109d9 + d89f2af commit da7db79

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎PWGLF/TableProducer/Strangeness/sigma0builder.cxx‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ struct sigma0builder {
7474
Preslice<V0DerivedMCDatas> perCollisionMCDerived = o2::aod::v0data::straCollisionId;
7575
Preslice<V0StandardDerivedDatas> perCollisionSTDDerived = o2::aod::v0data::straCollisionId;
7676
PresliceUnsorted<soa::Join<aod::StraCollisions, aod::StraCents, aod::StraEvSels, aod::StraCollLabels>> perMcCollision = aod::v0data::straMCCollisionId;
77-
77+
7878
// pack track quality but separte also afterburner
7979
// dynamic range: 0-31
8080
enum selection : int { hasTPC = 0,
@@ -147,7 +147,7 @@ struct sigma0builder {
147147
Configurable<float> LambdaMaxv0radius{"LambdaMaxv0radius", 60, "Max V0 radius (cm)"};
148148
Configurable<float> LambdaWindow{"LambdaWindow", 0.05, "Mass window around expected (in GeV/c2)"};
149149

150-
//// Photon criteria:
150+
//// Photon criteria:
151151
Configurable<float> PhotonMaxDauPseudoRap{"PhotonMaxDauPseudoRap", 1.5, "Max pseudorapidity of daughter tracks"};
152152
Configurable<float> PhotonMinDCAToPv{"PhotonMinDCAToPv", 0.0, "Min DCA daughter To PV (cm)"};
153153
Configurable<float> PhotonMaxDCAV0Dau{"PhotonMaxDCAV0Dau", 3.5, "Max DCA V0 Daughters (cm)"};
@@ -353,28 +353,28 @@ struct sigma0builder {
353353
histos.add("Pi0QA/h2dPtVsMassPi0AfterSel_Candidates", "h2dPtVsMassPi0AfterSel_Candidates", kTH2D, {axisPt, axisPi0Mass});
354354
}
355355

356-
if (doprocessGeneratedRun3){
357-
356+
if (doprocessGeneratedRun3) {
357+
358358
histos.add("Gen/hGenEvents", "hGenEvents", kTH2F, {{axisNch}, {2, -0.5f, +1.5f}});
359359
histos.get<TH2>(HIST("Gen/hGenEvents"))->GetYaxis()->SetBinLabel(1, "All gen. events");
360360
histos.get<TH2>(HIST("Gen/hGenEvents"))->GetYaxis()->SetBinLabel(2, "Gen. with at least 1 rec. events");
361-
361+
362362
histos.add("Gen/hGenEventCentrality", "hGenEventCentrality", kTH1F, {{101, 0.0f, 101.0f}});
363363
histos.add("Gen/hCentralityVsNcoll_beforeEvSel", "hCentralityVsNcoll_beforeEvSel", kTH2F, {axisCentrality, {50, -0.5f, 49.5f}});
364364
histos.add("Gen/hCentralityVsNcoll_afterEvSel", "hCentralityVsNcoll_afterEvSel", kTH2F, {axisCentrality, {50, -0.5f, 49.5f}});
365365
histos.add("Gen/hCentralityVsMultMC", "hCentralityVsMultMC", kTH2F, {{101, 0.0f, 101.0f}, axisNch});
366366
histos.add("Gen/h2dGenGamma", "h2dGenGamma", kTH2D, {axisCentrality, axisPt});
367367
histos.add("Gen/h2dGenLambda", "h2dGenLambda", kTH2D, {axisCentrality, axisPt});
368-
histos.add("Gen/h2dGenAntiLambda", "h2dGenAntiLambda", kTH2D, {axisCentrality, axisPt});
368+
histos.add("Gen/h2dGenAntiLambda", "h2dGenAntiLambda", kTH2D, {axisCentrality, axisPt});
369369
histos.add("Gen/h2dGenGammaVsMultMC_RecoedEvt", "h2dGenGammaVsMultMC_RecoedEvt", kTH2D, {axisNch, axisPt});
370370
histos.add("Gen/h2dGenLambdaVsMultMC_RecoedEvt", "h2dGenLambdaVsMultMC_RecoedEvt", kTH2D, {axisNch, axisPt});
371-
histos.add("Gen/h2dGenAntiLambdaVsMultMC_RecoedEvt", "h2dGenAntiLambdaVsMultMC_RecoedEvt", kTH2D, {axisNch, axisPt});
371+
histos.add("Gen/h2dGenAntiLambdaVsMultMC_RecoedEvt", "h2dGenAntiLambdaVsMultMC_RecoedEvt", kTH2D, {axisNch, axisPt});
372372
histos.add("Gen/h2dGenGammaVsMultMC", "h2dGenGammaVsMultMC", kTH2D, {axisNch, axisPt});
373373
histos.add("Gen/h2dGenLambdaVsMultMC", "h2dGenLambdaVsMultMC", kTH2D, {axisNch, axisPt});
374-
histos.add("Gen/h2dGenAntiLambdaVsMultMC", "h2dGenAntiLambdaVsMultMC", kTH2D, {axisNch, axisPt});
374+
histos.add("Gen/h2dGenAntiLambdaVsMultMC", "h2dGenAntiLambdaVsMultMC", kTH2D, {axisNch, axisPt});
375375
histos.add("Gen/hEventPVzMC", "hEventPVzMC", kTH1F, {{100, -20.0f, +20.0f}});
376376
histos.add("Gen/hCentralityVsPVzMC", "hCentralityVsPVzMC", kTH2F, {{101, 0.0f, 101.0f}, {100, -20.0f, +20.0f}});
377-
377+
378378
auto hPrimaryV0s = histos.add<TH1>("Gen/hPrimaryV0s", "hPrimaryV0s", kTH1D, {{2, -0.5f, 1.5f}});
379379
hPrimaryV0s->GetXaxis()->SetBinLabel(1, "All V0s");
380380
hPrimaryV0s->GetXaxis()->SetBinLabel(2, "Primary V0s");
@@ -567,15 +567,15 @@ struct sigma0builder {
567567
}
568568
}
569569

570-
// ______________________________________________________
570+
// ______________________________________________________
571571
// Simulated processing
572572
// Return the list of indices to the recoed collision associated to a given MC collision.
573573
template <typename TMCollisions, typename TCollisions>
574574
std::vector<int> getListOfRecoCollIndices(TMCollisions const& mcCollisions, TCollisions const& collisions)
575575
{
576576
std::vector<int> listBestCollisionIdx(mcCollisions.size());
577577
for (auto const& mcCollision : mcCollisions) {
578-
auto groupedCollisions = collisions.sliceBy(perMcCollision, mcCollision.globalIndex());
578+
auto groupedCollisions = collisions.sliceBy(perMcCollision, mcCollision.globalIndex());
579579
int biggestNContribs = -1;
580580
int bestCollisionIndex = -1;
581581
for (auto const& collision : groupedCollisions) {
@@ -590,7 +590,7 @@ struct sigma0builder {
590590
if (biggestNContribs < collision.multPVTotalContributors()) {
591591
biggestNContribs = collision.multPVTotalContributors();
592592
bestCollisionIndex = collision.globalIndex();
593-
}
593+
}
594594
}
595595
listBestCollisionIdx[mcCollision.globalIndex()] = bestCollisionIndex;
596596
}
@@ -621,7 +621,7 @@ struct sigma0builder {
621621

622622
histos.fill(HIST("Gen/hGenEvents"), mcCollision.multMCNParticlesEta05(), 0 /* all gen. events*/);
623623

624-
auto groupedCollisions = collisions.sliceBy(perMcCollision, mcCollision.globalIndex());
624+
auto groupedCollisions = collisions.sliceBy(perMcCollision, mcCollision.globalIndex());
625625
// Check if there is at least one of the reconstructed collisions associated to this MC collision
626626
// If so, we consider it
627627
bool atLeastOne = false;
@@ -633,12 +633,12 @@ struct sigma0builder {
633633
if (!IsEventAccepted(collision, false)) {
634634
continue;
635635
}
636-
636+
637637
if (biggestNContribs < collision.multPVTotalContributors()) {
638638
biggestNContribs = collision.multPVTotalContributors();
639639
centrality = doPPAnalysis ? collision.centFT0M() : collision.centFT0C();
640640
}
641-
641+
642642
nCollisions++;
643643
atLeastOne = true;
644644
}
@@ -656,7 +656,7 @@ struct sigma0builder {
656656
}
657657
return;
658658
}
659-
659+
660660
// ______________________________________________________
661661
// Simulated processing (subscribes to MC information too)
662662
template <typename TMCCollisions, typename TV0MCs, typename TCollisions>
@@ -674,17 +674,17 @@ struct sigma0builder {
674674

675675
histos.fill(HIST("Gen/hPrimaryV0s"), 1);
676676

677-
// TODO: get generated sigma0s
677+
// TODO: get generated sigma0s
678678

679679
float ptmc = v0MC.ptMC();
680680
float ymc = 1e3;
681681
if (v0MC.pdgCode() == 22)
682-
ymc = RecoDecay::y(std::array{v0MC.pxMC(), v0MC.pyMC(), v0MC.pzMC()}, o2::constants::physics::MassGamma);
683-
682+
ymc = RecoDecay::y(std::array{v0MC.pxMC(), v0MC.pyMC(), v0MC.pzMC()}, o2::constants::physics::MassGamma);
683+
684684
else if (std::abs(v0MC.pdgCode()) == 3122)
685685
ymc = v0MC.rapidityMC(1);
686686

687-
if (std::abs(ymc) > V0Rapidity)
687+
if (std::abs(ymc) > V0Rapidity)
688688
continue;
689689

690690
auto mcCollision = v0MC.template straMCCollision_as<soa::Join<aod::StraMCCollisions, aod::StraMCCollMults>>();
@@ -703,9 +703,9 @@ struct sigma0builder {
703703

704704
float centrality = 100.5f;
705705
if (listBestCollisionIdx[mcCollision.globalIndex()] > -1) {
706-
auto collision = collisions.iteratorAt(listBestCollisionIdx[mcCollision.globalIndex()]);
706+
auto collision = collisions.iteratorAt(listBestCollisionIdx[mcCollision.globalIndex()]);
707707
centrality = doPPAnalysis ? collision.centFT0M() : collision.centFT0C();
708-
708+
709709
if (v0MC.pdgCode() == 22) {
710710
histos.fill(HIST("Gen/h2dGenGammaVsMultMC_RecoedEvt"), mcCollision.multMCNParticlesEta05(), ptmc);
711711
}
@@ -728,7 +728,7 @@ struct sigma0builder {
728728
histos.fill(HIST("Gen/h2dGenAntiLambda"), centrality, ptmc);
729729
histos.fill(HIST("Gen/h2dGenAntiLambdaVsMultMC"), mcCollision.multMCNParticlesEta05(), ptmc);
730730
}
731-
}
731+
}
732732
}
733733

734734
template <typename TV0Object>
@@ -1091,7 +1091,7 @@ struct sigma0builder {
10911091
float fSigmaMass = RecoDecay::m(arrMom, std::array{o2::constants::physics::MassPhoton, o2::constants::physics::MassLambda0});
10921092
float fSigmaRap = RecoDecay::y(std::array{gamma.px() + lambda.px(), gamma.py() + lambda.py(), gamma.pz() + lambda.pz()}, o2::constants::physics::MassSigma0);
10931093
float fSigmaOPAngle = v1.Angle(v2);
1094-
float fSigmaCentrality = doPPAnalysis ? coll.centFT0M() : coll.centFT0C();
1094+
float fSigmaCentrality = doPPAnalysis ? coll.centFT0M() : coll.centFT0C();
10951095
uint64_t fSigmaTimeStamp = coll.timestamp();
10961096
int fSigmaRunNumber = coll.runNumber();
10971097

@@ -1197,7 +1197,7 @@ struct sigma0builder {
11971197
//_______________________________________________
11981198
// Wrongly collision association study
11991199
if (doAssocStudy && fhasMCColl) {
1200-
analyzeV0CollAssoc(coll, fullV0s, bestGammasArray, interactionRate, true); // Gamma
1200+
analyzeV0CollAssoc(coll, fullV0s, bestGammasArray, interactionRate, true); // Gamma
12011201
analyzeV0CollAssoc(coll, fullV0s, bestLambdasArray, interactionRate, false); // Lambda
12021202
}
12031203

@@ -1390,8 +1390,8 @@ struct sigma0builder {
13901390

13911391
// Simulated processing in Run 3 (subscribes to MC information too)
13921392
void processGeneratedRun3(soa::Join<aod::StraMCCollisions, aod::StraMCCollMults> const& mcCollisions, soa::Join<aod::V0MCCores, aod::V0MCCollRefs> const& V0MCCores, soa::Join<aod::StraCollisions, aod::StraCents, aod::StraEvSels, aod::StraStamps, aod::StraCollLabels> const& collisions, aod::MotherMCParts const& mcmothers)
1393-
{
1394-
analyzeGeneratedV0s(mcCollisions, V0MCCores, collisions);
1393+
{
1394+
analyzeGeneratedV0s(mcCollisions, V0MCCores, collisions);
13951395
}
13961396

13971397
PROCESS_SWITCH(sigma0builder, processMonteCarlo, "process as if MC data", false);

‎PWGLF/Tasks/Strangeness/sigmaanalysis.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ struct sigmaanalysis {
7474
Configurable<bool> fillQAhistos{"fillQAhistos", false, "if true, fill QA histograms"};
7575
Configurable<bool> fillBkgQAhistos{"fillBkgQAhistos", false, "if true, fill MC QA histograms for Bkg study. Only works with MC."};
7676
Configurable<bool> fillpTResoQAhistos{"fillpTResoQAhistos", false, "if true, fill MC QA histograms for pT resolution study. Only works with MC."};
77-
77+
7878
// Analysis strategy:
7979
Configurable<bool> fUseMLSel{"fUseMLSel", false, "Flag to use ML selection. If False, the standard selection is applied."};
8080
Configurable<bool> fselLambdaTPCPID{"fselLambdaTPCPID", true, "Flag to select lambda-like candidates using TPC NSigma."};
@@ -267,7 +267,7 @@ struct sigmaanalysis {
267267
histos.add(histodir + "/MC/Photon/h2dPosTPCNSigmaEl", "h2dPosTPCNSigmaEl", kTH2F, {axisPt, axisTPCNSigma});
268268
histos.add(histodir + "/MC/Photon/h2dNegTPCNSigmaEl", "h2dNegTPCNSigmaEl", kTH2F, {axisPt, axisTPCNSigma});
269269
histos.add(histodir + "/MC/Photon/h2dPosTPCNSigmaPi", "h2dPosTPCNSigmaPi", kTH2F, {axisPt, axisTPCNSigma});
270-
histos.add(histodir + "/MC/Photon/h2dNegTPCNSigmaPi", "h2dNegTPCNSigmaPi", kTH2F, {axisPt, axisTPCNSigma});
270+
histos.add(histodir + "/MC/Photon/h2dNegTPCNSigmaPi", "h2dNegTPCNSigmaPi", kTH2F, {axisPt, axisTPCNSigma});
271271
histos.add(histodir + "/MC/Photon/h2dPAVsPt", "h2dPAVsPt", kTH2F, {axisPA, axisPt});
272272
histos.add(histodir + "/MC/Photon/hPt_BadCollAssig", "hPt_BadCollAssig", kTH1F, {axisPt});
273273
histos.add(histodir + "/MC/Photon/h2dPAVsPt_BadCollAssig", "h2dPAVsPt_BadCollAssig", kTH2F, {axisPA, axisPt});
@@ -578,7 +578,7 @@ struct sigmaanalysis {
578578
histos.fill(HIST(MainDir[mode]) + HIST("/MC/Photon/h2dNegTPCNSigmaEl"), sigma.photonNegPt(), sigma.photonNegTPCNSigmaEl());
579579
histos.fill(HIST(MainDir[mode]) + HIST("/MC/Photon/h2dPosTPCNSigmaPi"), sigma.photonPosPt(), sigma.photonPosTPCNSigmaPi());
580580
histos.fill(HIST(MainDir[mode]) + HIST("/MC/Photon/h2dNegTPCNSigmaPi"), sigma.photonNegPt(), sigma.photonNegTPCNSigmaPi());
581-
581+
582582
histos.fill(HIST(MainDir[mode]) + HIST("/MC/Photon/h2dPAVsPt"), TMath::ACos(sigma.photonCosPA()), sigma.photonMCPt());
583583

584584
if (!sigma.photonIsCorrectlyAssoc()) {
@@ -857,7 +857,7 @@ struct sigmaanalysis {
857857
template <typename TV0Object>
858858
bool processSigmaCandidate(TV0Object const& cand)
859859
{
860-
860+
861861
// Do ML analysis
862862
if (fUseMLSel) {
863863
if ((cand.gammaBDTScore() == -1) || (cand.lambdaBDTScore() == -1) || (cand.antilambdaBDTScore() == -1)) {

0 commit comments

Comments
 (0)