Skip to content

Commit ec49d27

Browse files
authored
[PWGCF] Fix WithFitVars process functions in D2D prodcuer in femto framework (#18768)
1 parent ed404aa commit ec49d27

7 files changed

Lines changed: 110 additions & 40 deletions

File tree

‎PWGCF/Femto/Core/cascadeBuilder.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -783,8 +783,14 @@ struct ConfCascadeTablesDerivedToDerived : o2::framework::ConfigurableGroup {
783783
struct CascadeBuilderDerivedToDerivedProducts : o2::framework::ProducesGroup {
784784
o2::framework::Produces<o2::aod::StoredFXis> producedXis;
785785
o2::framework::Produces<o2::aod::StoredFXiMasks> producedXiMasks;
786+
// only actually filled when the input xi row carries FXiFrac (i.e. the WithFitVars process
787+
// function) -- see the if constexpr guard in processXis() below
788+
o2::framework::Produces<o2::aod::StoredFXiFrac> producedXiFrac;
786789
o2::framework::Produces<o2::aod::StoredFOmegas> producedOmegas;
787790
o2::framework::Produces<o2::aod::StoredFOmegaMasks> producedOmegaMasks;
791+
// only actually filled when the input omega row carries FOmegaFrac (i.e. the WithFitVars
792+
// process function) -- see the if constexpr guard in processOmegas() below
793+
o2::framework::Produces<o2::aod::StoredFOmegaFrac> producedOmegaFrac;
788794
};
789795

790796
class CascadeBuilderDerivedToDerived
@@ -851,6 +857,9 @@ class CascadeBuilderDerivedToDerived
851857
posDaughterIndex,
852858
negDaughterIndex);
853859
newXiTable.producedXiMasks(xi.mask());
860+
if constexpr (utils::HasCascadeCosPa<decltype(xi)>) {
861+
newXiTable.producedXiFrac(xi.cascadeCosPa());
862+
}
854863
}
855864
}
856865

@@ -881,6 +890,9 @@ class CascadeBuilderDerivedToDerived
881890
posDaughterIndex,
882891
negDaughterIndex);
883892
newOmegaTable.producedOmegaMasks(omega.mask());
893+
if constexpr (utils::HasCascadeCosPa<decltype(omega)>) {
894+
newOmegaTable.producedOmegaFrac(omega.cascadeCosPa());
895+
}
884896
}
885897
}
886898

‎PWGCF/Femto/Core/femtoUtils.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,26 @@ inline std::optional<T2> getIndex(const T1& index, const std::unordered_map<T1,
5050
return std::nullopt;
5151
}
5252

53+
/// require a V0 (lambda/k0short) row with a CosPa column -- used to gate derived-to-derived
54+
/// re-writes of the fraction-extraction tables (FLambdaFrac/FK0shortFrac) to only the input
55+
/// variants that actually carry them (e.g. the WithFitVars task-level process functions)
56+
template <typename T>
57+
concept HasCosPa = requires(T t) { t.cosPa(); };
58+
59+
/// require a cascade (xi/omega) row with a CascadeCosPa column -- same purpose as HasCosPa
60+
/// above, but for the FXiFrac/FOmegaFrac re-writes
61+
template <typename T>
62+
concept HasCascadeCosPa = requires(T t) { t.cascadeCosPa(); };
63+
64+
/// require a track row with DCA (xy and z) columns -- i.e. joined with FTrackDcas
65+
template <typename T>
66+
concept HasDca = requires(T t) { t.dcaXY(); t.dcaZ(); };
67+
68+
/// require a track row with ITS PID columns -- checking one species (pion) is enough
69+
/// since all seven (El/Pi/Ka/Pr/De/Tr/He) always come from the same upstream join
70+
template <typename T>
71+
concept HasItsNSigma = requires(T t) { t.itsNSigmaPi(); };
72+
5373
/// Translate a global daughter index into a row of the current track table frame.
5474
/// Aborts if the index does not fall inside the frame, which would otherwise
5575
/// silently produce an out-of-range iterator.

‎PWGCF/Femto/Core/trackBuilder.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -828,49 +828,49 @@ class TrackBuilder
828828
}
829829
if (mProduceElectronPids) {
830830
float itsEl = 0.f;
831-
if constexpr (requires(T1 t) { t.itsNSigmaEl(); }) {
831+
if constexpr (utils::HasItsNSigma<T1>) {
832832
itsEl = track.itsNSigmaEl();
833833
}
834834
trackProducts.producedElectronPids(itsEl, track.tpcNSigmaEl(), track.tofNSigmaEl());
835835
}
836836
if (mProducePionPids) {
837837
float itsPi = 0.f;
838-
if constexpr (requires(T1 t) { t.itsNSigmaPi(); }) {
838+
if constexpr (utils::HasItsNSigma<T1>) {
839839
itsPi = track.itsNSigmaPi();
840840
}
841841
trackProducts.producedPionPids(itsPi, track.tpcNSigmaPi(), track.tofNSigmaPi());
842842
}
843843
if (mProduceKaonPids) {
844844
float itsKa = 0.f;
845-
if constexpr (requires(T1 t) { t.itsNSigmaKa(); }) {
845+
if constexpr (utils::HasItsNSigma<T1>) {
846846
itsKa = track.itsNSigmaKa();
847847
}
848848
trackProducts.producedKaonPids(itsKa, track.tpcNSigmaKa(), track.tofNSigmaKa());
849849
}
850850
if (mProduceProtonPids) {
851851
float itsPr = 0.f;
852-
if constexpr (requires(T1 t) { t.itsNSigmaPr(); }) {
852+
if constexpr (utils::HasItsNSigma<T1>) {
853853
itsPr = track.itsNSigmaPr();
854854
}
855855
trackProducts.producedProtonPids(itsPr, track.tpcNSigmaPr(), track.tofNSigmaPr());
856856
}
857857
if (mProduceDeuteronPids) {
858858
float itsDe = 0.f;
859-
if constexpr (requires(T1 t) { t.itsNSigmaDe(); }) {
859+
if constexpr (utils::HasItsNSigma<T1>) {
860860
itsDe = track.itsNSigmaDe();
861861
}
862862
trackProducts.producedDeuteronPids(itsDe, track.tpcNSigmaDe(), track.tofNSigmaDe());
863863
}
864864
if (mProduceTritonPids) {
865865
float itsTr = 0.f;
866-
if constexpr (requires(T1 t) { t.itsNSigmaTr(); }) {
866+
if constexpr (utils::HasItsNSigma<T1>) {
867867
itsTr = track.itsNSigmaTr();
868868
}
869869
trackProducts.producedTritonPids(itsTr, track.tpcNSigmaTr(), track.tofNSigmaTr());
870870
}
871871
if (mProduceHeliumPids) {
872872
float itsHe = 0.f;
873-
if constexpr (requires(T1 t) { t.itsNSigmaHe(); }) {
873+
if constexpr (utils::HasItsNSigma<T1>) {
874874
itsHe = track.itsNSigmaHe();
875875
}
876876
trackProducts.producedHeliumPids(itsHe, track.tpcNSigmaHe(), track.tofNSigmaHe());
@@ -883,7 +883,7 @@ class TrackBuilder
883883
std::array<float, PuritySpeciesLast> tpcNSigma = {track.tpcNSigmaEl(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(), track.tpcNSigmaDe(), track.tpcNSigmaTr(), track.tpcNSigmaHe()};
884884
std::array<float, PuritySpeciesLast> tofNSigma = {track.tofNSigmaEl(), track.tofNSigmaPi(), track.tofNSigmaKa(), track.tofNSigmaPr(), track.tofNSigmaDe(), track.tofNSigmaTr(), track.tofNSigmaHe()};
885885

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

@@ -1111,7 +1111,7 @@ class TrackBuilderDerivedToDerived
11111111
trackProducts.producedTpcPurity(track.tpcPackedNSigma());
11121112
trackProducts.producedTofPurity(track.tofPackedNSigma(), track.purityHasTof());
11131113
}
1114-
if constexpr (requires(T1 t) { t.dcaXY(); }) {
1114+
if constexpr (utils::HasDca<T1>) {
11151115
trackProducts.producedTrackDcas(track.dcaXY(), track.dcaZ());
11161116
}
11171117

‎PWGCF/Femto/Core/trackHistManager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1106,7 +1106,7 @@ class TrackHistManager
11061106
mHistogramRegistry->fill(HIST(prefix) + HIST(FitVarsDir) + HIST(getHistName(kTpctofPurity, HistTable)), mAbsCharge * track.pt(), std::hypot(tpcNSigma, tofNSigma));
11071107
}
11081108
}
1109-
if constexpr (requires(T t) { t.dcaXY(); }) {
1109+
if constexpr (utils::HasDca<T>) {
11101110
mHistogramRegistry->fill(HIST(prefix) + HIST(FitVarsDir) + HIST(getHistName(kFractionDca, HistTable)), mAbsCharge * track.pt(), track.dcaXY(), track.dcaZ());
11111111
}
11121112
}

‎PWGCF/Femto/Core/v0Builder.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,9 @@ struct ConfV0TablesDerivedToDerived : o2::framework::ConfigurableGroup {
796796
struct V0BuilderDerivedToDerivedProducts : o2::framework::ProducesGroup {
797797
o2::framework::Produces<o2::aod::StoredFLambdas> producedLambdas;
798798
o2::framework::Produces<o2::aod::StoredFLambdaMasks> producedLambdaMasks;
799+
// only actually filled when the input lambda row carries FLambdaFrac (i.e. the WithFitVars
800+
// process function) -- see the if constexpr guard in processLambdas() below
801+
o2::framework::Produces<o2::aod::StoredFLambdaFrac> producedLambdaFrac;
799802
o2::framework::Produces<o2::aod::StoredFK0shorts> producedK0shorts;
800803
o2::framework::Produces<o2::aod::StoredFK0shortMasks> producedK0shortMasks;
801804
};
@@ -861,6 +864,9 @@ class V0BuilderDerivedToDerived
861864
posDaughterIndex,
862865
negDaughterIndex);
863866
newLambdaTable.producedLambdaMasks(lambda.mask());
867+
if constexpr (utils::HasCosPa<decltype(lambda)>) {
868+
newLambdaTable.producedLambdaFrac(lambda.cosPa());
869+
}
864870
}
865871
}
866872

‎PWGCF/Femto/DataModel/FemtoTables.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,7 @@ using FLambdaExtras = FLambdaExtras_001;
841841
DECLARE_SOA_TABLE_STAGED_VERSIONED(FLambdaFrac_001, "FLAMBDAFRAC", 1, //! lambda cpa for fraction extraction
842842
femtov0s::CosPa);
843843
using FLambdaFrac = FLambdaFrac_001;
844+
using StoredFLambdaFrac = StoredFLambdaFrac_001;
844845

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

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

15761579
namespace femtocharmhadrons
15771580
{

0 commit comments

Comments
 (0)