Skip to content

Commit dfcb03f

Browse files
FDUEnrichFDUEnrich
authored
Merge pull request #5 from alibuild/alibot-cleanup-9390
[PWGHF] Please consider the following formatting changes to AliceO2Group#9390
2 parents c24a3c7 + 8442dcd commit dfcb03f

File tree

2 files changed

+101
-107
lines changed

2 files changed

+101
-107
lines changed

‎PWGHF/TableProducer/candidateCreatorXic0Omegac0.cxx‎

Lines changed: 73 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ struct HfCandidateCreatorXic0Omegac0 {
179179
float chi2MassV0;
180180
float chi2MassCasc;
181181
float etaOmegac;
182-
float cascRejectInvmass;//rej
182+
float cascRejectInvmass; // rej
183183
} kfOmegac0Candidate;
184184

185185
struct {
@@ -293,37 +293,36 @@ struct HfCandidateCreatorXic0Omegac0 {
293293
registry.add("hInvMassOmegaMinus", "hInvMassOmegaMinus", kTH1D, {{1000, 1.6f, 2.0f}});
294294
registry.add("hInvMassXiMinus", "hInvMassXiMinus", kTH1D, {{1000, 1.25f, 1.65f}});
295295
registry.add("hInvMassXiMinus_rej", "hInvMassXiMinus_rej", kTH1D, {{1000, 1.25f, 1.65f}});
296-
//Additional KF hist
297-
registry.add("hKFParticlechi2TopoOmegacToPv", "hKFParticlechi2TopoOmegacToPv", kTH1D, {{1000, -0.1f, 100.0f}}); // new
298-
registry.add("hKFParticlechi2TopoCascToPv", "hKFParticlechi2TopoCascToPv", kTH1D, {{1000, -0.1f, 100.0f}}); // new
299-
registry.add("hKFParticleDcaXYV0DauPosToPv", "hKFParticleDcaXYV0DauPosToPv", kTH1D, {{1000, -0.1f, 100.0f}}); // new
300-
registry.add("hKFParticleDcaXYV0DauNegToPv", "hKFParticleDcaXYV0DauNegToPv", kTH1D, {{1000, -0.1f, 100.0f}}); // new
301-
registry.add("hEtaV0PosDau", "hEtaV0PosDau", kTH1D, {{1000, -5.0f, 5.0f}}); // new
302-
registry.add("hEtaV0NegDau", "hEtaV0NegDau", kTH1D, {{1000, -5.0f, 5.0f}}); // new
303-
registry.add("hEtaKaFromCasc", "hEtaKaFromCasc", kTH1D, {{1000, -5.0f, 5.0f}}); // new
304-
registry.add("hEtaPiFromCharmBaryon", "hEtaPiFromCharmBaryon", kTH1D, {{1000, -5.0f, 5.0f}}); // new
305-
registry.add("hCascradius", "hCascradius", kTH1D, {{1000, 0.0f, 50.0f}}); // new
306-
registry.add("hV0radius", "hV0radius", kTH1D, {{1000, 0.0f, 50.0f}}); // new
307-
registry.add("hCosPACasc", "hCosPACasc", kTH1D, {{5000, 0.0f, 1.0f}}); // new
308-
registry.add("hCosPAV0", "hCosPAV0", kTH1D, {{5000, 0.0f, 1.0f}}); // new
309-
registry.add("hDcaCascDau", "hDcaCascDau", kTH1D, {{1000, -0.1f, 100.0f}}); // new
310-
registry.add("hDcaV0Dau", "hDcaV0Dau", kTH1D, {{1000, -0.1f, 100.0f}}); // new
296+
// Additional KF hist
297+
registry.add("hKFParticlechi2TopoOmegacToPv", "hKFParticlechi2TopoOmegacToPv", kTH1D, {{1000, -0.1f, 100.0f}}); // new
298+
registry.add("hKFParticlechi2TopoCascToPv", "hKFParticlechi2TopoCascToPv", kTH1D, {{1000, -0.1f, 100.0f}}); // new
299+
registry.add("hKFParticleDcaXYV0DauPosToPv", "hKFParticleDcaXYV0DauPosToPv", kTH1D, {{1000, -0.1f, 100.0f}}); // new
300+
registry.add("hKFParticleDcaXYV0DauNegToPv", "hKFParticleDcaXYV0DauNegToPv", kTH1D, {{1000, -0.1f, 100.0f}}); // new
301+
registry.add("hEtaV0PosDau", "hEtaV0PosDau", kTH1D, {{1000, -5.0f, 5.0f}}); // new
302+
registry.add("hEtaV0NegDau", "hEtaV0NegDau", kTH1D, {{1000, -5.0f, 5.0f}}); // new
303+
registry.add("hEtaKaFromCasc", "hEtaKaFromCasc", kTH1D, {{1000, -5.0f, 5.0f}}); // new
304+
registry.add("hEtaPiFromCharmBaryon", "hEtaPiFromCharmBaryon", kTH1D, {{1000, -5.0f, 5.0f}}); // new
305+
registry.add("hCascradius", "hCascradius", kTH1D, {{1000, 0.0f, 50.0f}}); // new
306+
registry.add("hV0radius", "hV0radius", kTH1D, {{1000, 0.0f, 50.0f}}); // new
307+
registry.add("hCosPACasc", "hCosPACasc", kTH1D, {{5000, 0.0f, 1.0f}}); // new
308+
registry.add("hCosPAV0", "hCosPAV0", kTH1D, {{5000, 0.0f, 1.0f}}); // new
309+
registry.add("hDcaCascDau", "hDcaCascDau", kTH1D, {{1000, -0.1f, 100.0f}}); // new
310+
registry.add("hDcaV0Dau", "hDcaV0Dau", kTH1D, {{1000, -0.1f, 100.0f}}); // new
311311
registry.add("hImpactParBachFromCharmBaryonXY", "hImpactParBachFromCharmBaryonXY", kTH1D, {{1000, -5.0f, 5.0f}}); // new
312-
registry.add("hImpactParBachFromCharmBaryonZ", "hImpactParBachFromCharmBaryonZ", kTH1D, {{1000, -30.0f, 30.0f}}); // new
313-
registry.add("hImpactParCascXY", "hImpactParCascXY", kTH1D, {{1000, -5.0f, 5.0f}}); // new
314-
registry.add("hImpactParCascZ", "hImpactParCascZ", kTH1D, {{1000, -30.0f, 30.0f}}); // new
315-
registry.add("hPtKaFromCasc", "hPtKaFromCasc", kTH1D, {{1000, 0.0f, 20.0f}}); // new
316-
registry.add("hPtPiFromCharmBaryon", "hPtPiFromCharmBaryon", kTH1D, {{1000, 0.0f, 20.0f}}); // new
317-
registry.add("hCTauOmegac", "hCTauOmegac", kTH1D, {{1000, 0.0f, 10.0f}}); // new
318-
registry.add("hKFGeoV0Chi2OverNdf", "hKFGeoV0Chi2OverNdf", kTH1D, {{1000, 0.0f, 100.0f}}); // new
319-
registry.add("hKFGeoCascChi2OverNdf", "hKFGeoCascChi2OverNdf", kTH1D, {{1000, 0.0f, 100.0f}}); // new
320-
registry.add("hKFGeoCharmbaryonChi2OverNdf", "hKFGeoCharmbaryonChi2OverNdf", kTH1D, {{1000, 0.0f, 100.0f}}); // new
321-
registry.add("hKFdecayLenXYLambda", "hKFdecayLenXYLambda", kTH1D, {{1000, 0.0f, 50.0f}}); // new
322-
registry.add("hKFdecayLenXYCasc", "hKFdecayLenXYCasc", kTH1D, {{1000, 0.0f, 50.0f}}); // new
323-
registry.add("hKFdecayLenXYOmegac", "hKFdecayLenXYOmegac", kTH1D, {{1000, 0.0f, 50.0f}}); // new
324-
registry.add("hKFcosPaV0ToCasc", "hKFcosPaV0ToCasc", kTH1D, {{5000, -1.0f, 1.0f}}); // new
325-
registry.add("hKFcosPaCascToOmegac", "hKFcosPaCascToOmegac", kTH1D, {{5000, -1.0f, 1.0f}}); // new
326-
312+
registry.add("hImpactParBachFromCharmBaryonZ", "hImpactParBachFromCharmBaryonZ", kTH1D, {{1000, -30.0f, 30.0f}}); // new
313+
registry.add("hImpactParCascXY", "hImpactParCascXY", kTH1D, {{1000, -5.0f, 5.0f}}); // new
314+
registry.add("hImpactParCascZ", "hImpactParCascZ", kTH1D, {{1000, -30.0f, 30.0f}}); // new
315+
registry.add("hPtKaFromCasc", "hPtKaFromCasc", kTH1D, {{1000, 0.0f, 20.0f}}); // new
316+
registry.add("hPtPiFromCharmBaryon", "hPtPiFromCharmBaryon", kTH1D, {{1000, 0.0f, 20.0f}}); // new
317+
registry.add("hCTauOmegac", "hCTauOmegac", kTH1D, {{1000, 0.0f, 10.0f}}); // new
318+
registry.add("hKFGeoV0Chi2OverNdf", "hKFGeoV0Chi2OverNdf", kTH1D, {{1000, 0.0f, 100.0f}}); // new
319+
registry.add("hKFGeoCascChi2OverNdf", "hKFGeoCascChi2OverNdf", kTH1D, {{1000, 0.0f, 100.0f}}); // new
320+
registry.add("hKFGeoCharmbaryonChi2OverNdf", "hKFGeoCharmbaryonChi2OverNdf", kTH1D, {{1000, 0.0f, 100.0f}}); // new
321+
registry.add("hKFdecayLenXYLambda", "hKFdecayLenXYLambda", kTH1D, {{1000, 0.0f, 50.0f}}); // new
322+
registry.add("hKFdecayLenXYCasc", "hKFdecayLenXYCasc", kTH1D, {{1000, 0.0f, 50.0f}}); // new
323+
registry.add("hKFdecayLenXYOmegac", "hKFdecayLenXYOmegac", kTH1D, {{1000, 0.0f, 50.0f}}); // new
324+
registry.add("hKFcosPaV0ToCasc", "hKFcosPaV0ToCasc", kTH1D, {{5000, -1.0f, 1.0f}}); // new
325+
registry.add("hKFcosPaCascToOmegac", "hKFcosPaCascToOmegac", kTH1D, {{5000, -1.0f, 1.0f}}); // new
327326

328327
hfEvSel.addHistograms(registry); // collision monitoring
329328

@@ -758,26 +757,26 @@ struct HfCandidateCreatorXic0Omegac0 {
758757
KFParticle kfPosPr(kfTrack0, kProton);
759758
KFParticle kfNegPi(kfTrack1, kPiMinus);
760759
KFParticle kfNegKa(kfTrackBach, kKMinus);
761-
KFParticle kfNegPirej(kfTrackBach, kPiMinus);//rej
760+
KFParticle kfNegPirej(kfTrackBach, kPiMinus); // rej
762761
KFParticle kfPosPi(kfTrack0, kPiPlus);
763762
KFParticle kfNegPr(kfTrack1, kProton);
764763
KFParticle kfPosKa(kfTrackBach, kKPlus);
765-
KFParticle kfPosPirej(kfTrackBach, kPiPlus);//rej
764+
KFParticle kfPosPirej(kfTrackBach, kPiPlus); // rej
766765

767766
KFParticle kfBachKaon;
768767
KFParticle kfPos;
769768
KFParticle kfNeg;
770-
KFParticle kfBachrej;//rej
769+
KFParticle kfBachrej; // rej
771770
if (bachCharge < 0) {
772771
kfPos = kfPosPr;
773772
kfNeg = kfNegPi;
774773
kfBachKaon = kfNegKa;
775-
kfBachrej = kfNegPirej;//rej
774+
kfBachrej = kfNegPirej; // rej
776775
} else {
777776
kfPos = kfPosPi;
778777
kfNeg = kfNegPr;
779778
kfBachKaon = kfPosKa;
780-
kfBachrej = kfPosPirej;//rej
779+
kfBachrej = kfPosPirej; // rej
781780
}
782781

783782
//__________________________________________
@@ -815,23 +814,23 @@ struct HfCandidateCreatorXic0Omegac0 {
815814
//__________________________________________
816815
//*>~<* step 2 : reconstruct cascade(Omega) with KF
817816
const KFParticle* omegaDaugthers[2] = {&kfBachKaon, &kfV0};
818-
const KFParticle* omegaDaugthersrej[2] = {&kfBachrej, &kfV0};//rej
817+
const KFParticle* omegaDaugthersrej[2] = {&kfBachrej, &kfV0}; // rej
819818
// construct cascade
820819
KFParticle kfOmega;
821-
KFParticle kfOmegarej;//rej
820+
KFParticle kfOmegarej; // rej
822821
kfOmega.SetConstructMethod(kfConstructMethod);
823-
kfOmegarej.SetConstructMethod(kfConstructMethod);//rej
822+
kfOmegarej.SetConstructMethod(kfConstructMethod); // rej
824823
try {
825824
kfOmega.Construct(omegaDaugthers, 2);
826-
kfOmegarej.Construct(omegaDaugthersrej, 2);//rej
825+
kfOmegarej.Construct(omegaDaugthersrej, 2); // rej
827826
} catch (std::runtime_error& e) {
828827
LOG(debug) << "Failed to construct Omega or Omega_rej from V0 and bachelor track: " << e.what();
829828
continue;
830829
}
831830
float massCasc, sigCasc;
832831
float massCascrej, sigCascrej;
833832
kfOmega.GetMass(massCasc, sigCasc);
834-
kfOmegarej.GetMass(massCascrej, sigCascrej);//rej
833+
kfOmegarej.GetMass(massCascrej, sigCascrej); // rej
835834
// err_massOmega > 0
836835
if (sigCasc <= 0)
837836
continue;
@@ -842,7 +841,7 @@ struct HfCandidateCreatorXic0Omegac0 {
842841
continue;
843842
kfOmegac0Candidate.chi2GeoCasc = kfOmega.GetChi2();
844843
kfOmegac0Candidate.cascRejectInvmass = massCascrej;
845-
registry.fill(HIST("hInvMassXiMinusrej"), massCascrej);//rej
844+
registry.fill(HIST("hInvMassXiMinusrej"), massCascrej); // rej
846845
KFParticle kfOmegaMassConstrained = kfOmega;
847846
kfOmegaMassConstrained.SetNonlinearMassConstraint(o2::constants::physics::MassOmegaMinus); // set mass constrain to OmegaMinus
848847
if (kfUseCascadeMassConstraint) {
@@ -1086,48 +1085,46 @@ struct HfCandidateCreatorXic0Omegac0 {
10861085
registry.fill(HIST("hKFParticleCascBachTopoChi2"), cascBachTopoChi2);
10871086
registry.fill(HIST("hKFParticleV0TopoChi2"), kfOmegac0Candidate.chi2TopoV0ToCasc);
10881087
registry.fill(HIST("hKFParticleCascTopoChi2"), kfOmegac0Candidate.chi2TopoCascToOmegac);
1089-
registry.fill(HIST("hKFParticlechi2TopoOmegacToPv"), kfOmegac0Candidate.chi2TopoOmegacToPv);//new
1090-
registry.fill(HIST("hKFParticlechi2TopoCascToPv"), kfOmegac0Candidate.chi2TopoCascToPv);//new
1088+
registry.fill(HIST("hKFParticlechi2TopoOmegacToPv"), kfOmegac0Candidate.chi2TopoOmegacToPv); // new
1089+
registry.fill(HIST("hKFParticlechi2TopoCascToPv"), kfOmegac0Candidate.chi2TopoCascToPv); // new
10911090
registry.fill(HIST("hKFParticleDcaCharmBaryonDau"), kfOmegac0Candidate.kfDcaOmegacDau);
10921091
registry.fill(HIST("hKFParticleDcaXYCascBachToPv"), dcaxyCascBachelor);
1093-
registry.fill(HIST("hKFParticleDcaXYV0DauPosToPv"), dcaxyV0Dau0);//new
1094-
registry.fill(HIST("hKFParticleDcaXYV0DauNegToPv"), dcaxyV0Dau1);//new
1092+
registry.fill(HIST("hKFParticleDcaXYV0DauPosToPv"), dcaxyV0Dau0); // new
1093+
registry.fill(HIST("hKFParticleDcaXYV0DauNegToPv"), dcaxyV0Dau1); // new
10951094
registry.fill(HIST("hKfLambda_ldl"), kfOmegac0Candidate.ldlV0);
10961095
registry.fill(HIST("hKfOmega_ldl"), kfOmegac0Candidate.ldlCasc);
10971096
registry.fill(HIST("hKfOmegaC0_ldl"), kfOmegac0Candidate.ldlOmegac);
10981097
registry.fill(HIST("hDcaXYCascadeToPVKf"), kfOmegac0Candidate.kfDcaXYCascToPv);
1099-
//Additional histograms
1100-
if(fillAllHist)
1101-
{
1102-
registry.fill(HIST("hEtaV0PosDau"), kfPos.GetEta());
1103-
registry.fill(HIST("hEtaV0NegDau"), kfNeg.GetEta());
1104-
registry.fill(HIST("hEtaKaFromCasc"), kfBachKaonToOmega.GetEta());
1105-
registry.fill(HIST("hEtaPiFromCharmBaryon"), kfBachPionToOmegaC.GetEta());
1106-
registry.fill(HIST("hCascradius"), RecoDecay::sqrtSumOfSquares(vertexCasc[0], vertexCasc[1]));
1107-
registry.fill(HIST("hV0radius"), RecoDecay::sqrtSumOfSquares(vertexV0[0], vertexV0[1]));
1108-
registry.fill(HIST("hCosPACasc"), kfOmegac0Candidate.cosPaCascToPv);
1109-
registry.fill(HIST("hCosPAV0"), kfOmegac0Candidate.cosPaV0ToPv);
1110-
registry.fill(HIST("hDcaCascDau"), kfOmegac0Candidate.kfDcaCascDau);
1111-
registry.fill(HIST("hDcaV0Dau"), kfOmegac0Candidate.kfDcaV0Dau);
1112-
registry.fill(HIST("hDcaXYToPvKa"), dcaxyCascBachelor);
1113-
registry.fill(HIST("hImpactParBachFromCharmBaryonXY"), impactParBachFromCharmBaryonXY);
1114-
registry.fill(HIST("hImpactParBachFromCharmBaryonZ"), impactParBachFromCharmBaryonZ);
1115-
registry.fill(HIST("hImpactParCascXY"), impactParameterCasc.getY());
1116-
registry.fill(HIST("hImpactParCascZ"), impactParameterCasc.getZ());
1117-
registry.fill(HIST("hPtKaFromCasc"), RecoDecay::sqrtSumOfSquares(pVecCascBachelor[0], pVecCascBachelor[1]));
1118-
registry.fill(HIST("hPtPiFromCharmBaryon"), RecoDecay::sqrtSumOfSquares(pVecCharmBachelorAsD[0], pVecCharmBachelorAsD[1]));
1119-
registry.fill(HIST("hCTauOmegac"), kfOmegac0Candidate.ctOmegac);
1120-
registry.fill(HIST("hKFGeoV0Chi2OverNdf"), v0Chi2OverNdf);
1121-
registry.fill(HIST("hKFGeoCascChi2OverNdf"), cascChi2OverNdf);
1122-
registry.fill(HIST("hKFGeoCharmbaryonChi2OverNdf"), charmbaryonChi2OverNdf);
1123-
registry.fill(HIST("hKFdecayLenXYLambda"), kfOmegac0Candidate.decayLenXYLambda);
1124-
registry.fill(HIST("hKFdecayLenXYCasc"), kfOmegac0Candidate.decayLenXYCasc);
1125-
registry.fill(HIST("hKFdecayLenXYOmegac"), kfOmegac0Candidate.decayLenXYOmegac);
1126-
registry.fill(HIST("hKFcosPaV0ToCasc"), kfOmegac0Candidate.cosPaV0ToCasc);
1127-
registry.fill(HIST("hKFcosPaCascToOmegac"), kfOmegac0Candidate.cosPaCascToOmegac);
1098+
// Additional histograms
1099+
if (fillAllHist) {
1100+
registry.fill(HIST("hEtaV0PosDau"), kfPos.GetEta());
1101+
registry.fill(HIST("hEtaV0NegDau"), kfNeg.GetEta());
1102+
registry.fill(HIST("hEtaKaFromCasc"), kfBachKaonToOmega.GetEta());
1103+
registry.fill(HIST("hEtaPiFromCharmBaryon"), kfBachPionToOmegaC.GetEta());
1104+
registry.fill(HIST("hCascradius"), RecoDecay::sqrtSumOfSquares(vertexCasc[0], vertexCasc[1]));
1105+
registry.fill(HIST("hV0radius"), RecoDecay::sqrtSumOfSquares(vertexV0[0], vertexV0[1]));
1106+
registry.fill(HIST("hCosPACasc"), kfOmegac0Candidate.cosPaCascToPv);
1107+
registry.fill(HIST("hCosPAV0"), kfOmegac0Candidate.cosPaV0ToPv);
1108+
registry.fill(HIST("hDcaCascDau"), kfOmegac0Candidate.kfDcaCascDau);
1109+
registry.fill(HIST("hDcaV0Dau"), kfOmegac0Candidate.kfDcaV0Dau);
1110+
registry.fill(HIST("hDcaXYToPvKa"), dcaxyCascBachelor);
1111+
registry.fill(HIST("hImpactParBachFromCharmBaryonXY"), impactParBachFromCharmBaryonXY);
1112+
registry.fill(HIST("hImpactParBachFromCharmBaryonZ"), impactParBachFromCharmBaryonZ);
1113+
registry.fill(HIST("hImpactParCascXY"), impactParameterCasc.getY());
1114+
registry.fill(HIST("hImpactParCascZ"), impactParameterCasc.getZ());
1115+
registry.fill(HIST("hPtKaFromCasc"), RecoDecay::sqrtSumOfSquares(pVecCascBachelor[0], pVecCascBachelor[1]));
1116+
registry.fill(HIST("hPtPiFromCharmBaryon"), RecoDecay::sqrtSumOfSquares(pVecCharmBachelorAsD[0], pVecCharmBachelorAsD[1]));
1117+
registry.fill(HIST("hCTauOmegac"), kfOmegac0Candidate.ctOmegac);
1118+
registry.fill(HIST("hKFGeoV0Chi2OverNdf"), v0Chi2OverNdf);
1119+
registry.fill(HIST("hKFGeoCascChi2OverNdf"), cascChi2OverNdf);
1120+
registry.fill(HIST("hKFGeoCharmbaryonChi2OverNdf"), charmbaryonChi2OverNdf);
1121+
registry.fill(HIST("hKFdecayLenXYLambda"), kfOmegac0Candidate.decayLenXYLambda);
1122+
registry.fill(HIST("hKFdecayLenXYCasc"), kfOmegac0Candidate.decayLenXYCasc);
1123+
registry.fill(HIST("hKFdecayLenXYOmegac"), kfOmegac0Candidate.decayLenXYOmegac);
1124+
registry.fill(HIST("hKFcosPaV0ToCasc"), kfOmegac0Candidate.cosPaV0ToCasc);
1125+
registry.fill(HIST("hKFcosPaCascToOmegac"), kfOmegac0Candidate.cosPaCascToOmegac);
11281126
}
11291127

1130-
11311128
// fill the table
11321129
rowCandToOmegaPi(collision.globalIndex(),
11331130
pvCoord[0], pvCoord[1], pvCoord[2],

0 commit comments

Comments
 (0)