Skip to content

[PWGCF,PWGHF] Please consider the following formatting changes to #16736 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FDUEnrich merged 1 commit into from
Jun 18, 2026
Merged

[PWGCF,PWGHF] Please consider the following formatting changes to #16736 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions PWGCF/DataModel/FemtoDerived.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@

using BitMaskType = uint32_t; //! Definition of the data type for the collision masks

DECLARE_SOA_COLUMN(BitMaskTrackOne, bitmaskTrackOne, BitMaskType); //! Bit for track one

Check failure on line 48 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(BitMaskTrackTwo, bitmaskTrackTwo, BitMaskType); //! Bit for track two

Check failure on line 49 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(BitMaskTrackThree, bitmaskTrackThree, BitMaskType); //! Bit for track three

Check failure on line 50 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

DECLARE_SOA_COLUMN(Downsample, downsample, bool); //! Flag for downsampling

Expand Down Expand Up @@ -92,7 +92,7 @@

namespace mcfdcolllabel
{
DECLARE_SOA_INDEX_COLUMN(FDMCCollision, fdMCCollision); //! MC collision for femtodreamcollision

Check failure on line 95 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
}
DECLARE_SOA_TABLE_STAGED(FDMCCollLabels, "FDMCCollLabel", mcfdcolllabel::FDMCCollisionId);

Expand Down Expand Up @@ -154,13 +154,13 @@

static constexpr std::string_view TrackTypeName[kNTrackTypes] = {"Trk", "Pos", "Neg", "Bach"}; //! Naming of the different particle types

DECLARE_SOA_INDEX_COLUMN(FDCollision, fdCollision);

Check failure on line 157 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(Pt, pt, float); //! p_T (GeV/c)
DECLARE_SOA_COLUMN(Eta, eta, float); //! Eta
DECLARE_SOA_COLUMN(Phi, phi, float); //! Phi
DECLARE_SOA_COLUMN(PartType, partType, uint8_t); //! Type of the particle, according to femtodreamparticle::ParticleType
DECLARE_SOA_COLUMN(Cut, cut, cutContainerType); //! Bit-wise container for the different selection criteria
DECLARE_SOA_COLUMN(PIDCut, pidcut, cutContainerType); //! Bit-wise container for the different PID selection criteria \todo since bit-masking cannot be done yet with filters we use a second field for the PID

Check failure on line 163 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TempFitVar, tempFitVar, float); //! Observable for the template fitting (Track: DCA_xy, V0: CPA)
DECLARE_SOA_SELF_ARRAY_INDEX_COLUMN(Children, children); //! Field for the track indices to remove auto-correlations
DECLARE_SOA_COLUMN(MLambda, mLambda, float); //! The invariant mass of V0 candidate, assuming lambda
Expand Down Expand Up @@ -188,10 +188,10 @@
});
// debug variables
DECLARE_SOA_COLUMN(Sign, sign, int8_t); //! Sign of the track charge
DECLARE_SOA_COLUMN(TPCNClsFound, tpcNClsFound, uint8_t); //! Number of TPC clusters

Check failure on line 191 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(TPCNClsCrossedRows, tpcNClsCrossedRows, uint8_t); //! Number of TPC crossed rows

Check failure on line 192 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ITSNCls, itsNCls, uint8_t); //! Number of ITS clusters

Check failure on line 193 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_COLUMN(ITSNClsInnerBarrel, itsNClsInnerBarrel, uint8_t); //! Number of ITS clusters in the inner barrel //! TPC signal

Check failure on line 194 in PWGCF/DataModel/FemtoDerived.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column] 

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.
DECLARE_SOA_DYNAMIC_COLUMN(TPCCrossedRowsOverFindableCls, tpcCrossedRowsOverFindableCls, //! Compute the number of crossed rows over findable TPC clusters
[](uint8_t tpcNClsFindable, uint8_t tpcNClsCrossedRows) -> float {
return (float)tpcNClsCrossedRows / (float)tpcNClsFindable;
Expand Down Expand Up @@ -260,18 +260,18 @@
DECLARE_SOA_COLUMN(BDTPrompt, bdtPrompt, float); //! Prompt signal score using Boosted Decision Tree for charm hadron
DECLARE_SOA_COLUMN(BDTFD, bdtFD, float); //! Feed-down score using Boosted Decision Tree for charm hadron
DECLARE_SOA_COLUMN(CascBachelorTrackId, cascBachelorTrackId, int); //! Bachelor track ID from Xi cascade (Xic -> Xi pi pi)
DECLARE_SOA_COLUMN(CascPosTrackId, cascPosTrackId, int); //! Positive track ID from Lambda in Xi cascade (Xic -> Xi pi pi)
DECLARE_SOA_COLUMN(CascNegTrackId, cascNegTrackId, int); //! Negative track ID from Lambda in Xi cascade (Xic -> Xi pi pi)
DECLARE_SOA_COLUMN(CascBachelorPt, cascBachelorPt, float); //! pT of the bachelor track from the Xi cascade
DECLARE_SOA_COLUMN(CascBachelorPhi, cascBachelorPhi, float); //! phi of the bachelor track from the Xi cascade
DECLARE_SOA_COLUMN(CascBachelorEta, cascBachelorEta, float); //! eta of the bachelor track from the Xi cascade
DECLARE_SOA_COLUMN(CascPosPt, cascPosPt, float); //! pT of the positive Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascPosPhi, cascPosPhi, float); //! phi of the positive Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascPosEta, cascPosEta, float); //! eta of the positive Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascNegPt, cascNegPt, float); //! pT of the negative Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascNegPhi, cascNegPhi, float); //! phi of the negative Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascNegEta, cascNegEta, float); //! eta of the negative Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(FlagMc, flagMc, int); //! MC matching flag for the selected charm hadron decay channel
DECLARE_SOA_COLUMN(CascPosTrackId, cascPosTrackId, int); //! Positive track ID from Lambda in Xi cascade (Xic -> Xi pi pi)
DECLARE_SOA_COLUMN(CascNegTrackId, cascNegTrackId, int); //! Negative track ID from Lambda in Xi cascade (Xic -> Xi pi pi)
DECLARE_SOA_COLUMN(CascBachelorPt, cascBachelorPt, float); //! pT of the bachelor track from the Xi cascade
DECLARE_SOA_COLUMN(CascBachelorPhi, cascBachelorPhi, float); //! phi of the bachelor track from the Xi cascade
DECLARE_SOA_COLUMN(CascBachelorEta, cascBachelorEta, float); //! eta of the bachelor track from the Xi cascade
DECLARE_SOA_COLUMN(CascPosPt, cascPosPt, float); //! pT of the positive Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascPosPhi, cascPosPhi, float); //! phi of the positive Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascPosEta, cascPosEta, float); //! eta of the positive Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascNegPt, cascNegPt, float); //! pT of the negative Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascNegPhi, cascNegPhi, float); //! phi of the negative Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(CascNegEta, cascNegEta, float); //! eta of the negative Lambda daughter track from the Xi cascade
DECLARE_SOA_COLUMN(FlagMc, flagMc, int); //! MC matching flag for the selected charm hadron decay channel
DECLARE_SOA_COLUMN(OriginMcRec, originMcRec, int); //! flag for reconstruction level matching (1 for prompt, 2 for non-prompt)
DECLARE_SOA_COLUMN(OriginMcGen, originMcGen, int); //! flag for generator level matching (1 for prompt, 2 for non-prompt)
DECLARE_SOA_COLUMN(IsCandidateSwapped, isCandidateSwapped, int); //! swapping of the prongs order (0 for Lc -> pkpi, 1 for Lc -> pikp)
Expand Down Expand Up @@ -405,10 +405,10 @@
{
DECLARE_SOA_DYNAMIC_COLUMN(Y, y, //!
[](float pt0, float phi0, float eta0, float pt1, float phi1, float eta1, float pt2, float phi2, float eta2) -> float { return RecoDecay::y(RecoDecay::pVec(
RecoDecayPtEtaPhi::pVector(pt0, eta0, phi0),
RecoDecayPtEtaPhi::pVector(pt1, eta1, phi1),
RecoDecayPtEtaPhi::pVector(pt2, eta2, phi2)),
o2::constants::physics::MassXiCPlus); }); //! Rapidity distribution of Xic candidates
RecoDecayPtEtaPhi::pVector(pt0, eta0, phi0),
RecoDecayPtEtaPhi::pVector(pt1, eta1, phi1),
RecoDecayPtEtaPhi::pVector(pt2, eta2, phi2)),
o2::constants::physics::MassXiCPlus); }); //! Rapidity distribution of Xic candidates
} // namespace fdhf_xic

DECLARE_SOA_TABLE(FDHfCand3Prong, "AOD", "FDHFCAND3PRONG", //! Table to store the derived data for charm 3prong candidates
Expand Down
88 changes: 44 additions & 44 deletions PWGHF/HFC/TableProducer/producerCharmHadronsTrackFemtoDream.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,34 +435,34 @@ struct HfProducerCharmHadronsTrackFemtoDream {
void fillDebugParticle(ParticleType const& particle)
{
tables.outputDebugParts(particle.sign(),
(uint8_t)particle.tpcNClsFound(),
particle.tpcNClsFindable(),
(uint8_t)particle.tpcNClsCrossedRows(),
particle.tpcNClsShared(),
particle.tpcInnerParam(),
particle.itsNCls(),
particle.itsNClsInnerBarrel(),
particle.dcaXY(),
particle.dcaZ(),
particle.tpcSignal(),
-999.,
particle.tpcNSigmaPi(),
particle.tpcNSigmaKa(),
particle.tpcNSigmaPr(),
particle.tpcNSigmaDe(),
-999.,
-999.,
-999.,
particle.tofNSigmaPi(),
particle.tofNSigmaKa(),
particle.tofNSigmaPr(),
particle.tofNSigmaDe(),
-999., -999., -999., -999.,
-999., -999., -999., -999.,
-999., -999., -999., -999.,
-999., -999., -999., -999.,
-999., -999., -999., -999.,
-999., -999., -999.);
(uint8_t)particle.tpcNClsFound(),
particle.tpcNClsFindable(),
(uint8_t)particle.tpcNClsCrossedRows(),
particle.tpcNClsShared(),
particle.tpcInnerParam(),
particle.itsNCls(),
particle.itsNClsInnerBarrel(),
particle.dcaXY(),
particle.dcaZ(),
particle.tpcSignal(),
-999.,
particle.tpcNSigmaPi(),
particle.tpcNSigmaKa(),
particle.tpcNSigmaPr(),
particle.tpcNSigmaDe(),
-999.,
-999.,
-999.,
particle.tofNSigmaPi(),
particle.tofNSigmaKa(),
particle.tofNSigmaPr(),
particle.tofNSigmaDe(),
-999., -999., -999., -999.,
-999., -999., -999., -999.,
-999., -999., -999., -999.,
-999., -999., -999., -999.,
-999., -999., -999., -999.,
-999., -999., -999.);
}

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

tables.outputParts(tables.outputCollision.lastIndex(),
track.pt(),
track.eta(),
track.phi(),
aod::femtodreamparticle::ParticleType::kTrack,
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kCuts),
pidTrackPassBit,
track.dcaXY(), childIDs, 0, 0);
track.pt(),
track.eta(),
track.phi(),
aod::femtodreamparticle::ParticleType::kTrack,
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kCuts),
pidTrackPassBit,
track.dcaXY(), childIDs, 0, 0);
} else {
tables.outputParts(tables.outputCollision.lastIndex(),
track.pt(),
track.eta(),
track.phi(),
aod::femtodreamparticle::ParticleType::kTrack,
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kCuts),
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kPID),
track.dcaXY(), childIDs, 0, 0);
track.pt(),
track.eta(),
track.phi(),
aod::femtodreamparticle::ParticleType::kTrack,
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kCuts),
cutContainer.at(femtoDreamTrackSelection::TrackContainerPosition::kPID),
track.dcaXY(), childIDs, 0, 0);
}

fIsTrackFilled = true;
Expand Down Expand Up @@ -903,8 +903,8 @@ struct HfProducerCharmHadronsTrackFemtoDream {
}

tables.rowMasks(bitTrack,
bitCand,
0);
bitCand,
0);
}

template <bool IsMc, bool UseCharmMl, typename TrackType, typename CollisionType, typename CandType, typename DaughterTrackType>
Expand Down
2 changes: 1 addition & 1 deletion PWGHF/HFC/Tasks/taskCharmHadronsTrackFemtoDream.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ struct HfTaskCharmHadronsTrackFemtoDream {
LOG(fatal) << "Invalid PDG code for track mass hypothesis: " << trkPDGCode;
}

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