Skip to content

Commit f9290ce

Browse files
authored
Merge pull request #21 from alibuild/alibot-cleanup-16736
[PWGCF,PWGHF] Please consider the following formatting changes to #16736
2 parents d7e0f14 + af85e1a commit f9290ce

3 files changed

Lines changed: 61 additions & 61 deletions

File tree

PWGCF/DataModel/FemtoDerived.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -260,18 +260,18 @@ DECLARE_SOA_COLUMN(BDTBkg, bdtBkg, float); //! Background
260260
DECLARE_SOA_COLUMN(BDTPrompt, bdtPrompt, float); //! Prompt signal score using Boosted Decision Tree for charm hadron
261261
DECLARE_SOA_COLUMN(BDTFD, bdtFD, float); //! Feed-down score using Boosted Decision Tree for charm hadron
262262
DECLARE_SOA_COLUMN(CascBachelorTrackId, cascBachelorTrackId, int); //! Bachelor track ID from Xi cascade (Xic -> Xi pi pi)
263-
DECLARE_SOA_COLUMN(CascPosTrackId, cascPosTrackId, int); //! Positive track ID from Lambda in Xi cascade (Xic -> Xi pi pi)
264-
DECLARE_SOA_COLUMN(CascNegTrackId, cascNegTrackId, int); //! Negative track ID from Lambda in Xi cascade (Xic -> Xi pi pi)
265-
DECLARE_SOA_COLUMN(CascBachelorPt, cascBachelorPt, float); //! pT of the bachelor track from the Xi cascade
266-
DECLARE_SOA_COLUMN(CascBachelorPhi, cascBachelorPhi, float); //! phi of the bachelor track from the Xi cascade
267-
DECLARE_SOA_COLUMN(CascBachelorEta, cascBachelorEta, float); //! eta of the bachelor track from the Xi cascade
268-
DECLARE_SOA_COLUMN(CascPosPt, cascPosPt, float); //! pT of the positive Lambda daughter track from the Xi cascade
269-
DECLARE_SOA_COLUMN(CascPosPhi, cascPosPhi, float); //! phi of the positive Lambda daughter track from the Xi cascade
270-
DECLARE_SOA_COLUMN(CascPosEta, cascPosEta, float); //! eta of the positive Lambda daughter track from the Xi cascade
271-
DECLARE_SOA_COLUMN(CascNegPt, cascNegPt, float); //! pT of the negative Lambda daughter track from the Xi cascade
272-
DECLARE_SOA_COLUMN(CascNegPhi, cascNegPhi, float); //! phi of the negative Lambda daughter track from the Xi cascade
273-
DECLARE_SOA_COLUMN(CascNegEta, cascNegEta, float); //! eta of the negative Lambda daughter track from the Xi cascade
274-
DECLARE_SOA_COLUMN(FlagMc, flagMc, int); //! MC matching flag for the selected charm hadron decay channel
263+
DECLARE_SOA_COLUMN(CascPosTrackId, cascPosTrackId, int); //! Positive track ID from Lambda in Xi cascade (Xic -> Xi pi pi)
264+
DECLARE_SOA_COLUMN(CascNegTrackId, cascNegTrackId, int); //! Negative track ID from Lambda in Xi cascade (Xic -> Xi pi pi)
265+
DECLARE_SOA_COLUMN(CascBachelorPt, cascBachelorPt, float); //! pT of the bachelor track from the Xi cascade
266+
DECLARE_SOA_COLUMN(CascBachelorPhi, cascBachelorPhi, float); //! phi of the bachelor track from the Xi cascade
267+
DECLARE_SOA_COLUMN(CascBachelorEta, cascBachelorEta, float); //! eta of the bachelor track from the Xi cascade
268+
DECLARE_SOA_COLUMN(CascPosPt, cascPosPt, float); //! pT of the positive Lambda daughter track from the Xi cascade
269+
DECLARE_SOA_COLUMN(CascPosPhi, cascPosPhi, float); //! phi of the positive Lambda daughter track from the Xi cascade
270+
DECLARE_SOA_COLUMN(CascPosEta, cascPosEta, float); //! eta of the positive Lambda daughter track from the Xi cascade
271+
DECLARE_SOA_COLUMN(CascNegPt, cascNegPt, float); //! pT of the negative Lambda daughter track from the Xi cascade
272+
DECLARE_SOA_COLUMN(CascNegPhi, cascNegPhi, float); //! phi of the negative Lambda daughter track from the Xi cascade
273+
DECLARE_SOA_COLUMN(CascNegEta, cascNegEta, float); //! eta of the negative Lambda daughter track from the Xi cascade
274+
DECLARE_SOA_COLUMN(FlagMc, flagMc, int); //! MC matching flag for the selected charm hadron decay channel
275275
DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int); //! flag for reconstruction level matching (1 for prompt, 2 for non-prompt)
276276
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int); //! flag for generator level matching (1 for prompt, 2 for non-prompt)
277277
DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int); //! swapping of the prongs order (0 for Lc -> pkpi, 1 for Lc -> pikp)
@@ -405,10 +405,10 @@ namespace fdhf_xic
405405
{
406406
DECLARE_SOA_DYNAMIC_COLUMN(Y, y, //!
407407
[](float pt0, float phi0, float eta0, float pt1, float phi1, float eta1, float pt2, float phi2, float eta2) -> float { return RecoDecay::y(RecoDecay::pVec(
408-
RecoDecayPtEtaPhi::pVector(pt0, eta0, phi0),
409-
RecoDecayPtEtaPhi::pVector(pt1, eta1, phi1),
410-
RecoDecayPtEtaPhi::pVector(pt2, eta2, phi2)),
411-
o2::constants::physics::MassXiCPlus); }); //! Rapidity distribution of Xic candidates
408+
RecoDecayPtEtaPhi::pVector(pt0, eta0, phi0),
409+
RecoDecayPtEtaPhi::pVector(pt1, eta1, phi1),
410+
RecoDecayPtEtaPhi::pVector(pt2, eta2, phi2)),
411+
o2::constants::physics::MassXiCPlus); }); //! Rapidity distribution of Xic candidates
412412
} // namespace fdhf_xic
413413

414414
DECLARE_SOA_TABLE(FDHfCand3Prong, "AOD", "FDHFCAND3PRONG", //! Table to store the derived data for charm 3prong candidates

PWGHF/HFC/TableProducer/producerCharmHadronsTrackFemtoDream.cxx

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -435,34 +435,34 @@ struct HfProducerCharmHadronsTrackFemtoDream {
435435
void fillDebugParticle(ParticleType const& particle)
436436
{
437437
tables.outputDebugParts(particle.sign(),
438-
(uint8_t)particle.tpcNClsFound(),
439-
particle.tpcNClsFindable(),
440-
(uint8_t)particle.tpcNClsCrossedRows(),
441-
particle.tpcNClsShared(),
442-
particle.tpcInnerParam(),
443-
particle.itsNCls(),
444-
particle.itsNClsInnerBarrel(),
445-
particle.dcaXY(),
446-
particle.dcaZ(),
447-
particle.tpcSignal(),
448-
-999.,
449-
particle.tpcNSigmaPi(),
450-
particle.tpcNSigmaKa(),
451-
particle.tpcNSigmaPr(),
452-
particle.tpcNSigmaDe(),
453-
-999.,
454-
-999.,
455-
-999.,
456-
particle.tofNSigmaPi(),
457-
particle.tofNSigmaKa(),
458-
particle.tofNSigmaPr(),
459-
particle.tofNSigmaDe(),
460-
-999., -999., -999., -999.,
461-
-999., -999., -999., -999.,
462-
-999., -999., -999., -999.,
463-
-999., -999., -999., -999.,
464-
-999., -999., -999., -999.,
465-
-999., -999., -999.);
438+
(uint8_t)particle.tpcNClsFound(),
439+
particle.tpcNClsFindable(),
440+
(uint8_t)particle.tpcNClsCrossedRows(),
441+
particle.tpcNClsShared(),
442+
particle.tpcInnerParam(),
443+
particle.itsNCls(),
444+
particle.itsNClsInnerBarrel(),
445+
particle.dcaXY(),
446+
particle.dcaZ(),
447+
particle.tpcSignal(),
448+
-999.,
449+
particle.tpcNSigmaPi(),
450+
particle.tpcNSigmaKa(),
451+
particle.tpcNSigmaPr(),
452+
particle.tpcNSigmaDe(),
453+
-999.,
454+
-999.,
455+
-999.,
456+
particle.tofNSigmaPi(),
457+
particle.tofNSigmaKa(),
458+
particle.tofNSigmaPr(),
459+
particle.tofNSigmaDe(),
460+
-999., -999., -999., -999.,
461+
-999., -999., -999., -999.,
462+
-999., -999., -999., -999.,
463+
-999., -999., -999., -999.,
464+
-999., -999., -999., -999.,
465+
-999., -999., -999.);
466466
}
467467

468468
template <typename CollisionType, typename ParticleType>
@@ -565,22 +565,22 @@ struct HfProducerCharmHadronsTrackFemtoDream {
565565
const auto pidTrackPassBit = static_cast<aod::femtodreamparticle::cutContainerType>(isTrackKaonPidSelected(track));
566566

567567
tables.outputParts(tables.outputCollision.lastIndex(),
568-
track.pt(),
569-
track.eta(),
570-
track.phi(),
571-
aod::femtodreamparticle::ParticleType::kTrack,
572-
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kCuts),
573-
pidTrackPassBit,
574-
track.dcaXY(), childIDs, 0, 0);
568+
track.pt(),
569+
track.eta(),
570+
track.phi(),
571+
aod::femtodreamparticle::ParticleType::kTrack,
572+
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kCuts),
573+
pidTrackPassBit,
574+
track.dcaXY(), childIDs, 0, 0);
575575
} else {
576576
tables.outputParts(tables.outputCollision.lastIndex(),
577-
track.pt(),
578-
track.eta(),
579-
track.phi(),
580-
aod::femtodreamparticle::ParticleType::kTrack,
581-
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kCuts),
582-
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kPID),
583-
track.dcaXY(), childIDs, 0, 0);
577+
track.pt(),
578+
track.eta(),
579+
track.phi(),
580+
aod::femtodreamparticle::ParticleType::kTrack,
581+
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kCuts),
582+
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kPID),
583+
track.dcaXY(), childIDs, 0, 0);
584584
}
585585

586586
fIsTrackFilled = true;
@@ -903,8 +903,8 @@ struct HfProducerCharmHadronsTrackFemtoDream {
903903
}
904904

905905
tables.rowMasks(bitTrack,
906-
bitCand,
907-
0);
906+
bitCand,
907+
0);
908908
}
909909

910910
template <bool IsMc, bool UseCharmMl, typename TrackType, typename CollisionType, typename CandType, typename DaughterTrackType>

PWGHF/HFC/Tasks/taskCharmHadronsTrackFemtoDream.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ struct HfTaskCharmHadronsTrackFemtoDream {
436436
LOG(fatal) << "Invalid PDG code for track mass hypothesis: " << trkPDGCode;
437437
}
438438

439-
// D0 -> K pi + track (2-prong)
439+
// D0 -> K pi + track (2-prong)
440440
if constexpr (Channel == DecayChannel::D0ToPiK) {
441441
const auto pVecCharmTrk = std::array{pVecProng0, pVecProng1, pVecTrack};
442442
std::array<double, 3> massCharmTrk{};

0 commit comments

Comments
 (0)