Skip to content

Please consider the following formatting changes to #17424 #4

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
IgorPtak merged 1 commit into from
Aug 12, 2026
Merged

Please consider the following formatting changes to #17424 #4

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
20 changes: 10 additions & 10 deletions PWGCF/Femto/Core/charmHadronBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ using ConfLcSelection2 = ConfLcSelection<PrefixLcSelection2>;
/// registered is decided per species in CharmHadronSelection::configure.
enum CharmHadronSels {
// topological selections
kCpaMin, ///< Min. CPA (cosine pointing angle)
kDecayLengthMin, ///< Min. decay length
kCpaMin, ///< Min. CPA (cosine pointing angle)
kDecayLengthMin, ///< Min. decay length

// topological selections, 2-prong only (D0)
kImpactParameterProductMax, ///< Max. product of prong impact parameters (d0*d0)
Expand Down Expand Up @@ -472,12 +472,12 @@ class CharmHadronBuilder
{
if (mProduceD0s) {
charmHadronProducts.producedD0s(collisionProducts.producedCollision.lastIndex(),
signedPt,
candidate.eta(),
candidate.phi(),
mass,
posDauIndex,
negDauIndex);
signedPt,
candidate.eta(),
candidate.phi(),
mass,
posDauIndex,
negDauIndex);
}
if (mProduceD0Masks) {
charmHadronProducts.producedD0Masks(mCharmHadronSelection.getBitmask());
Expand Down Expand Up @@ -608,7 +608,7 @@ class CharmHadronBuilder

template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
void fillCharmHadrons(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4& trackProducts,
T5& charmHadronProducts, T6 const& candidates, T7 const& /*tracks*/, T8& trackBuilder)
T5& charmHadronProducts, T6 const& candidates, T7 const& /*tracks*/, T8& trackBuilder)
{
if (!mFillAnyTable) {
return;
Expand Down Expand Up @@ -656,7 +656,7 @@ class CharmHadronBuilder

template <modes::System system, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9, typename T10, typename T11, typename T12>
void fillMcCharmHadrons(T1 const& col, T2& collisionBuilder, T3& collisionProducts, T4 const& mcCols, T5& trackProducts,
T6& charmHadronProducts, T7 const& candidates, T8 const& tracks, T9& trackBuilder, T10 const& mcParticles, T11& mcBuilder, T12& mcProducts)
T6& charmHadronProducts, T7 const& candidates, T8 const& tracks, T9& trackBuilder, T10 const& mcParticles, T11& mcBuilder, T12& mcProducts)
{
if (!mFillAnyTable) {
return;
Expand Down
24 changes: 11 additions & 13 deletions PWGCF/Femto/Core/charmHadronHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,17 +256,17 @@ auto makeD0McQaHistSpecMap(const T1& confBinningAnalysis, const T2& confBinningQ
}

// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define LC_HIST_QA_MAP(conf) \
{kMassLcToPKPi, {(conf).massLcToPKPi}}, \
{kMassLcToPiKP, {(conf).massLcToPiKP}}, \
{kMlBkg, {(conf).mlScore}}, \
{kMlPrompt, {(conf).mlScore}}, \
{kMlNonPrompt, {(conf).mlScore}}, \
{kCpa, {(conf).cpa}}, \
{kCpaXY, {(conf).cpa}}, \
{kDecayLength, {(conf).decayLength}}, \
{kDecayLengthXY, {(conf).decayLength}}, \
{kChi2Pca, {(conf).chi2Pca}}, \
#define LC_HIST_QA_MAP(conf) \
{kMassLcToPKPi, {(conf).massLcToPKPi}}, \
{kMassLcToPiKP, {(conf).massLcToPiKP}}, \
{kMlBkg, {(conf).mlScore}}, \
{kMlPrompt, {(conf).mlScore}}, \
{kMlNonPrompt, {(conf).mlScore}}, \
{kCpa, {(conf).cpa}}, \
{kCpaXY, {(conf).cpa}}, \
{kDecayLength, {(conf).decayLength}}, \
{kDecayLengthXY, {(conf).decayLength}}, \
{kChi2Pca, {(conf).chi2Pca}}, \
{kImpactParameterProngSqSum, {(conf).impactParameterProngSqSum}},

template <typename T>
Expand All @@ -285,7 +285,6 @@ auto makeLcMcQaHistSpecMap(const T1& confBinningAnalysis, const T2& confBinningQ
CHARMHADRON_HIST_MC_MAP(confBinningAnalysis)};
}


#undef CHARMHADRON_HIST_ANALYSIS_MAP
#undef CHARMHADRON_HIST_MC_MAP
#undef CHARMHADRON_HIST_QA_MAP
Expand Down Expand Up @@ -538,7 +537,6 @@ class CharmHadronHistManager
}
}


void initMc(std::map<CharmHadronHist, std::vector<o2::framework::AxisSpec>> const& CharmHadronSpecs)
{
std::string mcDir = std::string(charmHadronPrefix) + std::string(McDir);
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Core/closePairRejection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ class ClosePairRejectionTrackLc
mCtrPion.compute(track, prong2);
}

[[nodiscard]] bool isClosePair() const { return mCtrProton.isClosePair() || mCtrKaon.isClosePair() || mCtrPion.isClosePair(); }
[[nodiscard]] bool isClosePair() const { return mCtrProton.isClosePair() || mCtrKaon.isClosePair() || mCtrPion.isClosePair(); }

void fill(float kstar)
{
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Core/mcBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ class McBuilder
if (!RecoDecay::isMatchedMCGen(mcParticles, mcParticle, o2::constants::physics::Pdg::kLambdaCPlus, std::array{+kProton, -kKPlus, +kPiPlus}, true, &sign, 2)) {
return;
}
if(std::abs(mcParticle.y()) > mCharmYGenMax) {
if (std::abs(mcParticle.y()) > mCharmYGenMax) {
return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Core/pairBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ class PairTrackLcBuilder
mMixingDepth = confMixing.depth.value;
}

template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
template <modes::Mode mode, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
void processSameEvent(T1 const& col, T2& trackTable, T3& trackPartition, T4& /*lcTable*/, T5& lcPartition, T6& cache)
{
auto trackSlice = trackPartition->sliceByCached(o2::aod::femtobase::stored::fColId, col.globalIndex(), cache);
Expand Down
4 changes: 1 addition & 3 deletions PWGCF/Femto/Core/pairHistManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,9 +711,7 @@ class PairHistManager
}

if (mPlotDalitz) {
if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) ||
modes::isEqual(particleType2, modes::Particle::kTwoTrackResonance) ||
modes::isEqual(particleType2, modes::Particle::kCharmHadron)) &&
if constexpr (modes::isEqual(particleType1, modes::Particle::kTrack) && (modes::isEqual(particleType2, modes::Particle::kV0) || modes::isEqual(particleType2, modes::Particle::kTwoTrackResonance) || modes::isEqual(particleType2, modes::Particle::kCharmHadron)) &&
requires(T2 p) { p.posDauId(); p.negDauId(); }) {
auto posDaughter = trackTable.rawIteratorAt(particle2.posDauId() - trackTable.offset());
auto negDaughter = trackTable.rawIteratorAt(particle2.negDauId() - trackTable.offset());
Expand Down
1 change: 0 additions & 1 deletion PWGCF/Femto/Core/partitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@
(o2::aod::femtobase::stored::mass < (selection).massMax) && \
ncheckbit(o2::aod::femtocharmhadrons::mask, (selection).mask)


// macros for mc collisions (mc only)
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define MAKE_MC_COLLISION_FILTER(selection) \
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/TableProducer/femtoProducer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,7 @@ struct FemtoProducer {
}
PROCESS_SWITCH(FemtoProducer, processTracksLcsRun3PbPb, "Provide tracks and Lcs in PbPb collisions", false);

void processTracksLcsRun3ppMc(rawinputs::Run3PpMcGenCollisions const& mcCols,
void processTracksLcsRun3ppMc(rawinputs::Run3PpMcGenCollisions const& mcCols,
rawinputs::Run3PpMcRecoCollisions const& cols,
o2::aod::BCsWithTimestamps const& bcs,
rawinputs::Run3McRecoTracks const& tracks,
Expand Down
3 changes: 0 additions & 3 deletions PWGCF/Femto/Tasks/femtoCharmHadronQa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ struct FemtoCharmHadronQa {
modes::CharmHadron::kLc>
lcHistManager;



// setup for daughters
trackhistmanager::ConfD01PosDauBinning confD01PosDaughterBinning;
trackhistmanager::ConfD01PosDauQaBinning confD01PosDaughterQaBinning;
Expand All @@ -127,7 +125,6 @@ struct FemtoCharmHadronQa {
trackhistmanager::ConfLc1PionDauBinning confLc1PionDaughterBinning;
trackhistmanager::ConfLc1PionDauQaBinning confLc1PionDaughterQaBinning;


o2::framework::HistogramRegistry hRegistry{"FemtoCharmHadronQa", {}, o2::framework::OutputObjHandlingPolicy::AnalysisObject};

void init(o2::framework::InitContext&)
Expand Down
Loading