Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions PWGCF/Femto/Core/cascadeBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -783,8 +783,14 @@ struct ConfCascadeTablesDerivedToDerived : o2::framework::ConfigurableGroup {
struct CascadeBuilderDerivedToDerivedProducts : o2::framework::ProducesGroup {
o2::framework::Produces<o2::aod::StoredFXis> producedXis;
o2::framework::Produces<o2::aod::StoredFXiMasks> producedXiMasks;
// only actually filled when the input xi row carries FXiFrac (i.e. the WithFitVars process
// function) -- see the if constexpr guard in processXis() below
o2::framework::Produces<o2::aod::StoredFXiFrac> producedXiFrac;
o2::framework::Produces<o2::aod::StoredFOmegas> producedOmegas;
o2::framework::Produces<o2::aod::StoredFOmegaMasks> producedOmegaMasks;
// only actually filled when the input omega row carries FOmegaFrac (i.e. the WithFitVars
// process function) -- see the if constexpr guard in processOmegas() below
o2::framework::Produces<o2::aod::StoredFOmegaFrac> producedOmegaFrac;
};

class CascadeBuilderDerivedToDerived
Expand Down Expand Up @@ -851,6 +857,9 @@ class CascadeBuilderDerivedToDerived
posDaughterIndex,
negDaughterIndex);
newXiTable.producedXiMasks(xi.mask());
if constexpr (utils::HasCascadeCosPa<decltype(xi)>) {
newXiTable.producedXiFrac(xi.cascadeCosPa());
}
}
}

Expand Down Expand Up @@ -881,6 +890,9 @@ class CascadeBuilderDerivedToDerived
posDaughterIndex,
negDaughterIndex);
newOmegaTable.producedOmegaMasks(omega.mask());
if constexpr (utils::HasCascadeCosPa<decltype(omega)>) {
newOmegaTable.producedOmegaFrac(omega.cascadeCosPa());
}
}
}

Expand Down
20 changes: 20 additions & 0 deletions PWGCF/Femto/Core/femtoUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,26 @@ inline std::optional<T2> getIndex(const T1& index, const std::unordered_map<T1,
return std::nullopt;
}

/// require a V0 (lambda/k0short) row with a CosPa column -- used to gate derived-to-derived
/// re-writes of the fraction-extraction tables (FLambdaFrac/FK0shortFrac) to only the input
/// variants that actually carry them (e.g. the WithFitVars task-level process functions)
template <typename T>
concept HasCosPa = requires(T t) { t.cosPa(); };

/// require a cascade (xi/omega) row with a CascadeCosPa column -- same purpose as HasCosPa
/// above, but for the FXiFrac/FOmegaFrac re-writes
template <typename T>
concept HasCascadeCosPa = requires(T t) { t.cascadeCosPa(); };

/// require a track row with DCA (xy and z) columns -- i.e. joined with FTrackDcas
template <typename T>
concept HasDca = requires(T t) { t.dcaXY(); t.dcaZ(); };

/// require a track row with ITS PID columns -- checking one species (pion) is enough
/// since all seven (El/Pi/Ka/Pr/De/Tr/He) always come from the same upstream join
template <typename T>
concept HasItsNSigma = requires(T t) { t.itsNSigmaPi(); };

/// Translate a global daughter index into a row of the current track table frame.
/// Aborts if the index does not fall inside the frame, which would otherwise
/// silently produce an out-of-range iterator.
Expand Down
18 changes: 9 additions & 9 deletions PWGCF/Femto/Core/trackBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -828,49 +828,49 @@ class TrackBuilder
}
if (mProduceElectronPids) {
float itsEl = 0.f;
if constexpr (requires(T1 t) { t.itsNSigmaEl(); }) {
if constexpr (utils::HasItsNSigma<T1>) {
itsEl = track.itsNSigmaEl();
}
trackProducts.producedElectronPids(itsEl, track.tpcNSigmaEl(), track.tofNSigmaEl());
}
if (mProducePionPids) {
float itsPi = 0.f;
if constexpr (requires(T1 t) { t.itsNSigmaPi(); }) {
if constexpr (utils::HasItsNSigma<T1>) {
itsPi = track.itsNSigmaPi();
}
trackProducts.producedPionPids(itsPi, track.tpcNSigmaPi(), track.tofNSigmaPi());
}
if (mProduceKaonPids) {
float itsKa = 0.f;
if constexpr (requires(T1 t) { t.itsNSigmaKa(); }) {
if constexpr (utils::HasItsNSigma<T1>) {
itsKa = track.itsNSigmaKa();
}
trackProducts.producedKaonPids(itsKa, track.tpcNSigmaKa(), track.tofNSigmaKa());
}
if (mProduceProtonPids) {
float itsPr = 0.f;
if constexpr (requires(T1 t) { t.itsNSigmaPr(); }) {
if constexpr (utils::HasItsNSigma<T1>) {
itsPr = track.itsNSigmaPr();
}
trackProducts.producedProtonPids(itsPr, track.tpcNSigmaPr(), track.tofNSigmaPr());
}
if (mProduceDeuteronPids) {
float itsDe = 0.f;
if constexpr (requires(T1 t) { t.itsNSigmaDe(); }) {
if constexpr (utils::HasItsNSigma<T1>) {
itsDe = track.itsNSigmaDe();
}
trackProducts.producedDeuteronPids(itsDe, track.tpcNSigmaDe(), track.tofNSigmaDe());
}
if (mProduceTritonPids) {
float itsTr = 0.f;
if constexpr (requires(T1 t) { t.itsNSigmaTr(); }) {
if constexpr (utils::HasItsNSigma<T1>) {
itsTr = track.itsNSigmaTr();
}
trackProducts.producedTritonPids(itsTr, track.tpcNSigmaTr(), track.tofNSigmaTr());
}
if (mProduceHeliumPids) {
float itsHe = 0.f;
if constexpr (requires(T1 t) { t.itsNSigmaHe(); }) {
if constexpr (utils::HasItsNSigma<T1>) {
itsHe = track.itsNSigmaHe();
}
trackProducts.producedHeliumPids(itsHe, track.tpcNSigmaHe(), track.tofNSigmaHe());
Expand All @@ -883,7 +883,7 @@ class TrackBuilder
std::array<float, PuritySpeciesLast> tpcNSigma = {track.tpcNSigmaEl(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(), track.tpcNSigmaDe(), track.tpcNSigmaTr(), track.tpcNSigmaHe()};
std::array<float, PuritySpeciesLast> tofNSigma = {track.tofNSigmaEl(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(), track.tofNSigmaDe(), track.tofNSigmaTr(), track.tofNSigmaHe()};

if constexpr (requires(T1 t) { t.itsNSigmaEl(); }) {
if constexpr (utils::HasItsNSigma<T1>) {
itsNSigma = {track.itsNSigmaEl(), track.itsNSigmaPi(), track.itsNSigmaKa(), track.itsNSigmaPr(), track.itsNSigmaDe(), track.itsNSigmaTr(), track.itsNSigmaHe()};
}

Expand Down Expand Up @@ -1111,7 +1111,7 @@ class TrackBuilderDerivedToDerived
trackProducts.producedTpcPurity(track.tpcPackedNSigma());
trackProducts.producedTofPurity(track.tofPackedNSigma(), track.purityHasTof());
}
if constexpr (requires(T1 t) { t.dcaXY(); }) {
if constexpr (utils::HasDca<T1>) {
trackProducts.producedTrackDcas(track.dcaXY(), track.dcaZ());
}

Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Femto/Core/trackHistManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ class TrackHistManager
mHistogramRegistry->fill(HIST(prefix) + HIST(FitVarsDir) + HIST(getHistName(kTpctofPurity, HistTable)), mAbsCharge * track.pt(), std::hypot(tpcNSigma, tofNSigma));
}
}
if constexpr (requires(T t) { t.dcaXY(); }) {
if constexpr (utils::HasDca<T>) {
mHistogramRegistry->fill(HIST(prefix) + HIST(FitVarsDir) + HIST(getHistName(kFractionDca, HistTable)), mAbsCharge * track.pt(), track.dcaXY(), track.dcaZ());
}
}
Expand Down
6 changes: 6 additions & 0 deletions PWGCF/Femto/Core/v0Builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,9 @@ struct ConfV0TablesDerivedToDerived : o2::framework::ConfigurableGroup {
struct V0BuilderDerivedToDerivedProducts : o2::framework::ProducesGroup {
o2::framework::Produces<o2::aod::StoredFLambdas> producedLambdas;
o2::framework::Produces<o2::aod::StoredFLambdaMasks> producedLambdaMasks;
// only actually filled when the input lambda row carries FLambdaFrac (i.e. the WithFitVars
// process function) -- see the if constexpr guard in processLambdas() below
o2::framework::Produces<o2::aod::StoredFLambdaFrac> producedLambdaFrac;
o2::framework::Produces<o2::aod::StoredFK0shorts> producedK0shorts;
o2::framework::Produces<o2::aod::StoredFK0shortMasks> producedK0shortMasks;
};
Expand Down Expand Up @@ -861,6 +864,9 @@ class V0BuilderDerivedToDerived
posDaughterIndex,
negDaughterIndex);
newLambdaTable.producedLambdaMasks(lambda.mask());
if constexpr (utils::HasCosPa<decltype(lambda)>) {
newLambdaTable.producedLambdaFrac(lambda.cosPa());
}
}
}

Expand Down
3 changes: 3 additions & 0 deletions PWGCF/Femto/DataModel/FemtoTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,7 @@ using FLambdaExtras = FLambdaExtras_001;
DECLARE_SOA_TABLE_STAGED_VERSIONED(FLambdaFrac_001, "FLAMBDAFRAC", 1, //! lambda cpa for fraction extraction
femtov0s::CosPa);
using FLambdaFrac = FLambdaFrac_001;
using StoredFLambdaFrac = StoredFLambdaFrac_001;

// table for basic k0short information
DECLARE_SOA_TABLE_STAGED_VERSIONED(FK0shorts_001, "FK0SHORT", 1, //! femto k0shorts
Expand Down Expand Up @@ -1500,6 +1501,7 @@ using FXiExtras = FXiExtras_001;
DECLARE_SOA_TABLE_STAGED_VERSIONED(FXiFrac_001, "FXIFRAC", 1, //! xi cpa for fraction extraction
femtocascades::CascadeCosPa);
using FXiFrac = FXiFrac_001;
using StoredFXiFrac = StoredFXiFrac_001;

DECLARE_SOA_TABLE_STAGED_VERSIONED(FOmegas_001, "FOMEGA", 1, //! femto omegas
o2::soa::Index<>,
Expand Down Expand Up @@ -1572,6 +1574,7 @@ using FOmegaExtras = FOmegaExtras_001;
DECLARE_SOA_TABLE_STAGED_VERSIONED(FOmegaFrac_001, "FOMEGAFRAC", 1, //! omega cpa for fraction extraction
femtocascades::CascadeCosPa);
using FOmegaFrac = FOmegaFrac_001;
using StoredFOmegaFrac = StoredFOmegaFrac_001;

namespace femtocharmhadrons
{
Expand Down
Loading
Loading