From 1bd735f7f590ecc07143e06fb7419cde3b174cd9 Mon Sep 17 00:00:00 2001 From: Anton Riedel Date: Mon, 16 Nov 2026 13:37:26 +0100 Subject: [PATCH] Fix: fix WithFitVars process function in D2D prodcuer --- PWGCF/Femto/Core/cascadeBuilder.h | 12 +++ PWGCF/Femto/Core/femtoUtils.h | 20 +++++ PWGCF/Femto/Core/trackBuilder.h | 18 ++-- PWGCF/Femto/Core/trackHistManager.h | 2 +- PWGCF/Femto/Core/v0Builder.h | 6 ++ PWGCF/Femto/DataModel/FemtoTables.h | 3 + .../femtoProducerDerivedToDerived.cxx | 89 ++++++++++++------- 7 files changed, 110 insertions(+), 40 deletions(-) diff --git a/PWGCF/Femto/Core/cascadeBuilder.h b/PWGCF/Femto/Core/cascadeBuilder.h index 3dda17bf3a5..b38e76c83a6 100644 --- a/PWGCF/Femto/Core/cascadeBuilder.h +++ b/PWGCF/Femto/Core/cascadeBuilder.h @@ -783,8 +783,14 @@ struct ConfCascadeTablesDerivedToDerived : o2::framework::ConfigurableGroup { struct CascadeBuilderDerivedToDerivedProducts : o2::framework::ProducesGroup { o2::framework::Produces producedXis; o2::framework::Produces 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 producedXiFrac; o2::framework::Produces producedOmegas; o2::framework::Produces 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 producedOmegaFrac; }; class CascadeBuilderDerivedToDerived @@ -851,6 +857,9 @@ class CascadeBuilderDerivedToDerived posDaughterIndex, negDaughterIndex); newXiTable.producedXiMasks(xi.mask()); + if constexpr (utils::HasCascadeCosPa) { + newXiTable.producedXiFrac(xi.cascadeCosPa()); + } } } @@ -881,6 +890,9 @@ class CascadeBuilderDerivedToDerived posDaughterIndex, negDaughterIndex); newOmegaTable.producedOmegaMasks(omega.mask()); + if constexpr (utils::HasCascadeCosPa) { + newOmegaTable.producedOmegaFrac(omega.cascadeCosPa()); + } } } diff --git a/PWGCF/Femto/Core/femtoUtils.h b/PWGCF/Femto/Core/femtoUtils.h index 60c481229ba..b5b1dbf9c99 100644 --- a/PWGCF/Femto/Core/femtoUtils.h +++ b/PWGCF/Femto/Core/femtoUtils.h @@ -50,6 +50,26 @@ inline std::optional getIndex(const T1& index, const std::unordered_map +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 +concept HasCascadeCosPa = requires(T t) { t.cascadeCosPa(); }; + +/// require a track row with DCA (xy and z) columns -- i.e. joined with FTrackDcas +template +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 +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. diff --git a/PWGCF/Femto/Core/trackBuilder.h b/PWGCF/Femto/Core/trackBuilder.h index 3e703ddd94e..c63ddbe048c 100644 --- a/PWGCF/Femto/Core/trackBuilder.h +++ b/PWGCF/Femto/Core/trackBuilder.h @@ -828,49 +828,49 @@ class TrackBuilder } if (mProduceElectronPids) { float itsEl = 0.f; - if constexpr (requires(T1 t) { t.itsNSigmaEl(); }) { + if constexpr (utils::HasItsNSigma) { 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) { 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) { 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) { 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) { 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) { 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) { itsHe = track.itsNSigmaHe(); } trackProducts.producedHeliumPids(itsHe, track.tpcNSigmaHe(), track.tofNSigmaHe()); @@ -883,7 +883,7 @@ class TrackBuilder std::array tpcNSigma = {track.tpcNSigmaEl(), track.tpcNSigmaPi(), track.tpcNSigmaKa(), track.tpcNSigmaPr(), track.tpcNSigmaDe(), track.tpcNSigmaTr(), track.tpcNSigmaHe()}; std::array 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) { itsNSigma = {track.itsNSigmaEl(), track.itsNSigmaPi(), track.itsNSigmaKa(), track.itsNSigmaPr(), track.itsNSigmaDe(), track.itsNSigmaTr(), track.itsNSigmaHe()}; } @@ -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) { trackProducts.producedTrackDcas(track.dcaXY(), track.dcaZ()); } diff --git a/PWGCF/Femto/Core/trackHistManager.h b/PWGCF/Femto/Core/trackHistManager.h index be224cf6b95..ce7d6fcd1e4 100644 --- a/PWGCF/Femto/Core/trackHistManager.h +++ b/PWGCF/Femto/Core/trackHistManager.h @@ -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) { mHistogramRegistry->fill(HIST(prefix) + HIST(FitVarsDir) + HIST(getHistName(kFractionDca, HistTable)), mAbsCharge * track.pt(), track.dcaXY(), track.dcaZ()); } } diff --git a/PWGCF/Femto/Core/v0Builder.h b/PWGCF/Femto/Core/v0Builder.h index 154233ebfa4..0650c44d478 100644 --- a/PWGCF/Femto/Core/v0Builder.h +++ b/PWGCF/Femto/Core/v0Builder.h @@ -796,6 +796,9 @@ struct ConfV0TablesDerivedToDerived : o2::framework::ConfigurableGroup { struct V0BuilderDerivedToDerivedProducts : o2::framework::ProducesGroup { o2::framework::Produces producedLambdas; o2::framework::Produces 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 producedLambdaFrac; o2::framework::Produces producedK0shorts; o2::framework::Produces producedK0shortMasks; }; @@ -861,6 +864,9 @@ class V0BuilderDerivedToDerived posDaughterIndex, negDaughterIndex); newLambdaTable.producedLambdaMasks(lambda.mask()); + if constexpr (utils::HasCosPa) { + newLambdaTable.producedLambdaFrac(lambda.cosPa()); + } } } diff --git a/PWGCF/Femto/DataModel/FemtoTables.h b/PWGCF/Femto/DataModel/FemtoTables.h index 1419010f224..815fd9d6be6 100644 --- a/PWGCF/Femto/DataModel/FemtoTables.h +++ b/PWGCF/Femto/DataModel/FemtoTables.h @@ -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 @@ -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<>, @@ -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 { diff --git a/PWGCF/Femto/TableProducer/femtoProducerDerivedToDerived.cxx b/PWGCF/Femto/TableProducer/femtoProducerDerivedToDerived.cxx index c7c560e0f8e..7c50a5b4c6c 100644 --- a/PWGCF/Femto/TableProducer/femtoProducerDerivedToDerived.cxx +++ b/PWGCF/Femto/TableProducer/femtoProducerDerivedToDerived.cxx @@ -53,11 +53,20 @@ using FemtoTracksWithMass = o2::soa::Join; // needs the upstream producer's TrackTables.produceItsPurity/produceTpcPurity/produceTofPurity/produceTrackDcas enabled using FemtoTracksWithFitVars = o2::soa::Join; using FemtoLambdas = o2::soa::Join; +// opt-in: carries the lambda's own fraction table through to the re-written output -- +// needs the upstream producer's V0Tables.produceLambdaFrac enabled +using FemtoLambdasWithFitVars = o2::soa::Join; using FemtoK0shorts = o2::soa::Join; using FemtoRho0s = o2::soa::Join; using FemtoPhis = o2::soa::Join; using FemtoXis = o2::soa::Join; +// opt-in: carries the xi's own fraction table through to the re-written output -- +// needs the upstream producer's CascadeTables.produceXiFrac enabled +using FemtoXisWithFitVars = o2::soa::Join; using FemtoOmegas = o2::soa::Join; +// opt-in: carries the omega's own fraction table through to the re-written output -- +// needs the upstream producer's CascadeTables.produceOmegaFrac enabled +using FemtoOmegasWithFitVars = o2::soa::Join; using FemtoSigma = o2::soa::Join; using FemtoSigmaPlus = o2::soa::Join; using FemtoSigmaPlusExtended = o2::soa::Join; @@ -83,6 +92,7 @@ struct FemtoProducerDerivedToDerived { o2::framework::Preslice perColTracksWithMass = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColTracksWithFitVars = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColLambdas = o2::aod::femtobase::stored::fColId; + o2::framework::Preslice perColLambdasWithFitVars = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColK0shorts = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColRho0s = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColPhis = o2::aod::femtobase::stored::fColId; @@ -92,7 +102,9 @@ struct FemtoProducerDerivedToDerived { o2::framework::Preslice perColSigmaPlusPcm = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColSigmaPlusPcmExtended = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColXis = o2::aod::femtobase::stored::fColId; + o2::framework::Preslice perColXisWithFitVars = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColOmegas = o2::aod::femtobase::stored::fColId; + o2::framework::Preslice perColOmegasWithFitVars = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColMcTracks = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColMcSigma = o2::aod::femtobase::stored::fColId; o2::framework::Preslice perColMcSigmaPlus = o2::aod::femtobase::stored::fColId; @@ -139,6 +151,7 @@ struct FemtoProducerDerivedToDerived { v0builder::ConfLambdaSelection1 lambdaSelection1; o2::framework::Partition lambdaPartition = MAKE_LAMBDA_PARTITION(lambdaSelection1); + o2::framework::Partition lambdaWithFitVarsPartition = MAKE_LAMBDA_PARTITION(lambdaSelection1); v0builder::ConfK0shortSelection1 k0shortSelection1; o2::framework::Partition k0shortPartition = MAKE_K0SHORT_PARTITION(k0shortSelection1); @@ -174,9 +187,11 @@ struct FemtoProducerDerivedToDerived { cascadebuilder::ConfXiSelection xiSelection; o2::framework::Partition xiPartition = MAKE_CASCADE_PARTITION(xiSelection); + o2::framework::Partition xiWithFitVarsPartition = MAKE_CASCADE_PARTITION(xiSelection); cascadebuilder::ConfOmegaSelection omegaSelection; o2::framework::Partition omegaPartition = MAKE_CASCADE_PARTITION(omegaSelection); + o2::framework::Partition omegaWithFitVarsPartition = MAKE_CASCADE_PARTITION(omegaSelection); // mc builder mcbuilder::McBuilderDerivedToDerivedProducts mcBuilderProducts; @@ -197,15 +212,15 @@ struct FemtoProducerDerivedToDerived { { const int activeProcesses = static_cast(doprocessTracks) + static_cast(doprocessTracksWithMass) + static_cast(doprocessTracksWithFitVars) + - static_cast(doprocessTracksLambdas) + static_cast(doprocessTracksWithMassLambdas) + static_cast(doprocessTracksWithFitVarsLambdas) + + static_cast(doprocessTracksLambdas) + static_cast(doprocessTracksWithMassLambdas) + static_cast(doprocessTracksLambdasWithFitVars) + static_cast(doprocessLambdas) + - static_cast(doprocessTracksXis) + static_cast(doprocessTracksWithFitVarsXis) + - static_cast(doprocessTracksOmegas) + static_cast(doprocessTracksWithFitVarsOmegas) + - static_cast(doprocessTracksK0shorts) + static_cast(doprocessTracksWithFitVarsK0shorts) + static_cast(doprocessTracksSigma) + + static_cast(doprocessTracksXis) + static_cast(doprocessTracksXisWithFitVars) + + static_cast(doprocessTracksOmegas) + static_cast(doprocessTracksOmegasWithFitVars) + + static_cast(doprocessTracksK0shorts) + static_cast(doprocessTracksK0shortsWithFitVars) + static_cast(doprocessTracksSigma) + static_cast(doprocessTracksSigmaPlus) + static_cast(doprocessTracksSigmaPlusExtended) + static_cast(doprocessTracksSigmaPlusPcm) + static_cast(doprocessTracksSigmaPlusPcmExtended) + static_cast(doprocessTracksRho0) + static_cast(doprocessTracksPhi) + - static_cast(doprocessLambdasXis) + + static_cast(doprocessLambdasXis) + static_cast(doprocessLambdasXisWithFitVars) + static_cast(doprocessTracksMc) + static_cast(doprocessTracksSigmaMc) + static_cast(doprocessTracksSigmaPlusMc) + static_cast(doprocessTracksSigmaPlusExtendedMc) + static_cast(doprocessTracksSigmaPlusPcmMc) + static_cast(doprocessTracksSigmaPlusPcmExtendedMc); @@ -218,10 +233,10 @@ struct FemtoProducerDerivedToDerived { // an unused builder is free to keep its (possibly all-zero) default limits const bool needsTrackBuilder = doprocessTracks || doprocessTracksWithMass || doprocessTracksWithFitVars || - doprocessTracksLambdas || doprocessTracksWithMassLambdas || doprocessTracksWithFitVarsLambdas || - doprocessTracksXis || doprocessTracksWithFitVarsXis || - doprocessTracksOmegas || doprocessTracksWithFitVarsOmegas || - doprocessTracksK0shorts || doprocessTracksWithFitVarsK0shorts || + doprocessTracksLambdas || doprocessTracksWithMassLambdas || doprocessTracksLambdasWithFitVars || + doprocessTracksXis || doprocessTracksXisWithFitVars || + doprocessTracksOmegas || doprocessTracksOmegasWithFitVars || + doprocessTracksK0shorts || doprocessTracksK0shortsWithFitVars || doprocessTracksSigma || doprocessTracksSigmaPlus || doprocessTracksSigmaPlusExtended || doprocessTracksSigmaPlusPcm || doprocessTracksSigmaPlusPcmExtended || doprocessTracksRho0 || doprocessTracksPhi || @@ -229,15 +244,15 @@ struct FemtoProducerDerivedToDerived { doprocessTracksSigmaPlusExtendedMc || doprocessTracksSigmaPlusPcmMc || doprocessTracksSigmaPlusPcmExtendedMc; const bool needsV0Builder = - doprocessTracksLambdas || doprocessTracksWithMassLambdas || doprocessTracksWithFitVarsLambdas || + doprocessTracksLambdas || doprocessTracksWithMassLambdas || doprocessTracksLambdasWithFitVars || doprocessLambdas || - doprocessTracksK0shorts || doprocessTracksWithFitVarsK0shorts || - doprocessLambdasXis; + doprocessTracksK0shorts || doprocessTracksK0shortsWithFitVars || + doprocessLambdasXis || doprocessLambdasXisWithFitVars; const bool needsCascadeBuilder = - doprocessTracksXis || doprocessTracksWithFitVarsXis || - doprocessTracksOmegas || doprocessTracksWithFitVarsOmegas || - doprocessLambdasXis; + doprocessTracksXis || doprocessTracksXisWithFitVars || + doprocessTracksOmegas || doprocessTracksOmegasWithFitVars || + doprocessLambdasXis || doprocessLambdasXisWithFitVars; const bool needsKinkBuilder = doprocessTracksSigma || doprocessTracksSigmaPlus || doprocessTracksSigmaPlusExtended || @@ -314,7 +329,7 @@ struct FemtoProducerDerivedToDerived { builders.trackBuilder.processTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache, trackBuilderProducts, collisionBuilderProducts); } } - PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksWithFitVars, "Process tracks, carrying through FitVars tables", false); + PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksWithFitVars, "Process tracks, carrying through their purity and DCA (fraction-extraction) tables", false); void processTracksLambdas(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracks const& tracks, femtotables::FemtoLambdas const& lambdas) { @@ -344,19 +359,19 @@ struct FemtoProducerDerivedToDerived { } PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksWithMassLambdas, "Process lambdas and tracks with mass", false); - void processTracksWithFitVarsLambdas(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracksWithFitVars const& tracks, femtotables::FemtoLambdas const& lambdas) + void processTracksLambdasWithFitVars(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracksWithFitVars const& tracks, femtotables::FemtoLambdasWithFitVars const& lambdas) { builders.trackBuilder.reset(tracks); for (auto const& col : cols) { - if (builders.trackBuilder.collisionHasTooFewTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache) || builders.v0Builder.collisionHasTooFewLambdas(col, lambdas, lambdaPartition, cache)) { + if (builders.trackBuilder.collisionHasTooFewTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache) || builders.v0Builder.collisionHasTooFewLambdas(col, lambdas, lambdaWithFitVarsPartition, cache)) { continue; } builders.collisionBuilder.processCollision(col, collisionBuilderProducts); builders.trackBuilder.processTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache, trackBuilderProducts, collisionBuilderProducts); - builders.v0Builder.processLambdas(col, lambdas, tracks, lambdaPartition, builders.trackBuilder, cache, v0BuilderProducts, trackBuilderProducts, collisionBuilderProducts); + builders.v0Builder.processLambdas(col, lambdas, tracks, lambdaWithFitVarsPartition, builders.trackBuilder, cache, v0BuilderProducts, trackBuilderProducts, collisionBuilderProducts); } } - PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksWithFitVarsLambdas, "Process lambdas and tracks, carrying through FitVars tables", false); + PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksLambdasWithFitVars, "Process lambdas and tracks, carrying through the tracks' purity/DCA tables and the lambdas' fraction-extraction table", false); void processLambdas(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracks const& tracks, femtotables::FemtoLambdas const& lambdas) { @@ -385,19 +400,19 @@ struct FemtoProducerDerivedToDerived { } PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksXis, "Process tracks and xis", false); - void processTracksWithFitVarsXis(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracksWithFitVars const& tracks, femtotables::FemtoXis const& xis) + void processTracksXisWithFitVars(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracksWithFitVars const& tracks, femtotables::FemtoXisWithFitVars const& xis) { builders.trackBuilder.reset(tracks); for (auto const& col : cols) { - if (builders.trackBuilder.collisionHasTooFewTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache) || builders.cascadeBuilder.collisionHasTooFewXis(col, xis, xiPartition, cache)) { + if (builders.trackBuilder.collisionHasTooFewTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache) || builders.cascadeBuilder.collisionHasTooFewXis(col, xis, xiWithFitVarsPartition, cache)) { continue; } builders.collisionBuilder.processCollision(col, collisionBuilderProducts); builders.trackBuilder.processTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache, trackBuilderProducts, collisionBuilderProducts); - builders.cascadeBuilder.processXis(col, xis, tracks, xiPartition, builders.trackBuilder, cache, cascadeBuilderProducts, trackBuilderProducts, collisionBuilderProducts); + builders.cascadeBuilder.processXis(col, xis, tracks, xiWithFitVarsPartition, builders.trackBuilder, cache, cascadeBuilderProducts, trackBuilderProducts, collisionBuilderProducts); } } - PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksWithFitVarsXis, "Process tracks and xis, carrying through FitVars tables", false); + PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksXisWithFitVars, "Process tracks and xis, carrying through the tracks' purity/DCA tables and the xis' fraction-extraction table", false); void processTracksOmegas(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracks const& tracks, femtotables::FemtoOmegas const& omegas) { @@ -413,19 +428,19 @@ struct FemtoProducerDerivedToDerived { } PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksOmegas, "Process tracks and omegas", false); - void processTracksWithFitVarsOmegas(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracksWithFitVars const& tracks, femtotables::FemtoOmegas const& omegas) + void processTracksOmegasWithFitVars(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracksWithFitVars const& tracks, femtotables::FemtoOmegasWithFitVars const& omegas) { builders.trackBuilder.reset(tracks); for (auto const& col : cols) { - if (builders.trackBuilder.collisionHasTooFewTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache) || builders.cascadeBuilder.collisionHasTooFewOmegas(col, omegas, omegaPartition, cache)) { + if (builders.trackBuilder.collisionHasTooFewTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache) || builders.cascadeBuilder.collisionHasTooFewOmegas(col, omegas, omegaWithFitVarsPartition, cache)) { continue; } builders.collisionBuilder.processCollision(col, collisionBuilderProducts); builders.trackBuilder.processTracks(col, tracks, trackWithFitVarsPartition1, trackWithFitVarsPartition2, cache, trackBuilderProducts, collisionBuilderProducts); - builders.cascadeBuilder.processOmegas(col, omegas, tracks, omegaPartition, builders.trackBuilder, cache, cascadeBuilderProducts, trackBuilderProducts, collisionBuilderProducts); + builders.cascadeBuilder.processOmegas(col, omegas, tracks, omegaWithFitVarsPartition, builders.trackBuilder, cache, cascadeBuilderProducts, trackBuilderProducts, collisionBuilderProducts); } } - PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksWithFitVarsOmegas, "Process tracks and omegas, carrying through FitVars tables", false); + PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksOmegasWithFitVars, "Process tracks and omegas, carrying through the tracks' purity/DCA tables and the omegas' fraction-extraction table", false); void processTracksK0shorts(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracks const& tracks, femtotables::FemtoK0shorts const& k0shorts) { @@ -441,7 +456,7 @@ struct FemtoProducerDerivedToDerived { } PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksK0shorts, "Process k0short and tracks", false); - void processTracksWithFitVarsK0shorts(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracksWithFitVars const& tracks, femtotables::FemtoK0shorts const& k0shorts) + void processTracksK0shortsWithFitVars(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracksWithFitVars const& tracks, femtotables::FemtoK0shorts const& k0shorts) { builders.trackBuilder.reset(tracks); for (auto const& col : cols) { @@ -453,7 +468,7 @@ struct FemtoProducerDerivedToDerived { builders.v0Builder.processK0shorts(col, k0shorts, tracks, k0shortPartition, builders.trackBuilder, cache, v0BuilderProducts, trackBuilderProducts, collisionBuilderProducts); } } - PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksWithFitVarsK0shorts, "Process k0short and tracks, carrying through FitVars tables", false); + PROCESS_SWITCH(FemtoProducerDerivedToDerived, processTracksK0shortsWithFitVars, "Process k0short and tracks, carrying through the tracks' purity and DCA (fraction-extraction) tables", false); void processTracksSigma(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracks const& tracks, femtotables::FemtoSigma const& sigma) { @@ -567,6 +582,20 @@ struct FemtoProducerDerivedToDerived { } PROCESS_SWITCH(FemtoProducerDerivedToDerived, processLambdasXis, "Process lambdas and xis", false); + void processLambdasXisWithFitVars(femtotables::FilteredFemtoCollisions const& cols, femtotables::FemtoTracks const& tracks, femtotables::FemtoLambdasWithFitVars const& lambdas, femtotables::FemtoXisWithFitVars const& xis) + { + builders.trackBuilder.reset(tracks); + for (auto const& col : cols) { + if (builders.v0Builder.collisionHasTooFewLambdas(col, lambdas, lambdaWithFitVarsPartition, cache) || builders.cascadeBuilder.collisionHasTooFewXis(col, xis, xiWithFitVarsPartition, cache)) { + continue; + } + builders.collisionBuilder.processCollision(col, collisionBuilderProducts); + builders.v0Builder.processLambdas(col, lambdas, tracks, lambdaWithFitVarsPartition, builders.trackBuilder, cache, v0BuilderProducts, trackBuilderProducts, collisionBuilderProducts); + builders.cascadeBuilder.processXis(col, xis, tracks, xiWithFitVarsPartition, builders.trackBuilder, cache, cascadeBuilderProducts, trackBuilderProducts, collisionBuilderProducts); + } + } + PROCESS_SWITCH(FemtoProducerDerivedToDerived, processLambdasXisWithFitVars, "Process lambdas and xis, carrying through their fraction-extraction tables", false); + // mc processing void processTracksMc(femtotables::FilteredFemtoMcCollisions const& cols, femtotables::FemtoMcTracks const& tracks,