@@ -83,6 +83,11 @@ using MyBarrelTracksWithCov = soa::Join<aod::Tracks, aod::TracksExtra, aod::Trac
8383 aod::pidTPCFullKa, aod::pidTPCFullPr,
8484 aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
8585 aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta>;
86+ using MyBarrelTracksWithCovOnlyStdPID = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov, aod::TracksDCA, aod::TrackSelection,
87+ aod::pidTPCFullEl, aod::pidTPCFullPi,
88+ aod::pidTPCFullKa, aod::pidTPCFullPr,
89+ aod::pidTOFFullEl, aod::pidTOFFullPi,
90+ aod::pidTOFFullKa, aod::pidTOFFullPr>;
8691using MyBarrelTracksWithV0Bits = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov, aod::TracksDCA, aod::TrackSelection,
8792 aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi,
8893 aod::pidTPCFullKa, aod::pidTPCFullPr,
@@ -123,6 +128,7 @@ constexpr static uint32_t gkEventFillMapWithCentAndMults = VarManager::ObjTypes:
123128// constexpr static uint32_t gkEventFillMapWithCentRun2 = VarManager::ObjTypes::BC | VarManager::ObjTypes::Collision | VarManager::ObjTypes::CollisionCentRun2; // Unused variable
124129constexpr static uint32_t gkTrackFillMap = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackPID | VarManager::ObjTypes::TrackPIDExtra;
125130constexpr static uint32_t gkTrackFillMapWithCov = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackCov | VarManager::ObjTypes::TrackPID | VarManager::ObjTypes::TrackPIDExtra;
131+ constexpr static uint32_t gkTrackFillMapWithCovOnlyStdPID = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackCov | VarManager::ObjTypes::TrackPID;
126132constexpr static uint32_t gkTrackFillMapWithV0Bits = gkTrackFillMap | VarManager::ObjTypes::TrackV0Bits;
127133constexpr static uint32_t gkTrackFillMapWithV0BitsForMaps = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackV0Bits | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackTPCPID;
128134constexpr static uint32_t gkTrackFillMapWithDalitzBits = gkTrackFillMap | VarManager::ObjTypes::DalitzBits;
@@ -266,7 +272,7 @@ struct TableMaker {
266272 context.mOptions .get <bool >(" processFullWithCovMultsAndEventFilter" ) ||
267273 context.mOptions .get <bool >(" processBarrelOnly" ) || context.mOptions .get <bool >(" processBarrelOnlyWithCent" ) || context.mOptions .get <bool >(" processBarrelOnlyWithCovWithCent" ) ||
268274 context.mOptions .get <bool >(" processBarrelOnlyWithMults" ) || context.mOptions .get <bool >(" processBarrelOnlyWithCentAndMults" ) || context.mOptions .get <bool >(" processBarrelOnlyWithCovWithCentAndMults" ) ||
269- context.mOptions .get <bool >(" processBarrelOnlyWithCov" ) || context.mOptions .get <bool >(" processBarrelOnlyWithEventFilter" ) ||
275+ context.mOptions .get <bool >(" processBarrelOnlyWithCov" ) || context.mOptions .get <bool >(" processBarrelOnlyWithCovOnlyStdPID " ) || context. mOptions . get < bool >( " processBarrelOnlyWithEventFilter" ) ||
270276 context.mOptions .get <bool >(" processBarrelOnlyWithMultsAndEventFilter" ) || context.mOptions .get <bool >(" processBarrelOnlyWithCovAndEventFilter" ) ||
271277 context.mOptions .get <bool >(" processBarrelOnlyWithDalitzBits" ) || context.mOptions .get <bool >(" processBarrelOnlyWithV0Bits" ) || context.mOptions .get <bool >(" processBarrelWithDalitzEvent" ) ||
272278 context.mOptions .get <bool >(" processBarrelOnlyWithV0BitsAndMaps" ) || context.mOptions .get <bool >(" processAmbiguousBarrelOnly" )) ||
@@ -612,11 +618,19 @@ struct TableMaker {
612618 float nSigmaPi = (fConfigComputeTPCpostCalib ? VarManager::fgValues[VarManager::kTPCnSigmaPi_Corr ] : track.tpcNSigmaPi ());
613619 float nSigmaKa = ((fConfigComputeTPCpostCalib && fConfigComputeTPCpostCalibKaon ) ? VarManager::fgValues[VarManager::kTPCnSigmaKa_Corr ] : track.tpcNSigmaKa ());
614620 float nSigmaPr = (fConfigComputeTPCpostCalib ? VarManager::fgValues[VarManager::kTPCnSigmaPr_Corr ] : track.tpcNSigmaPr ());
615- trackBarrelPID (track.tpcSignal (),
616- nSigmaEl, track.tpcNSigmaMu (), nSigmaPi, nSigmaKa, nSigmaPr,
617- track.beta (),
618- track.tofNSigmaEl (), track.tofNSigmaMu (), track.tofNSigmaPi (), track.tofNSigmaKa (), track.tofNSigmaPr (),
619- track.trdSignal ());
621+ if constexpr (static_cast <bool >(TTrackFillMap & VarManager::ObjTypes::TrackPIDExtra)) {
622+ trackBarrelPID (track.tpcSignal (),
623+ nSigmaEl, track.tpcNSigmaMu (), nSigmaPi, nSigmaKa, nSigmaPr,
624+ track.beta (),
625+ track.tofNSigmaEl (), track.tofNSigmaMu (), track.tofNSigmaPi (), track.tofNSigmaKa (), track.tofNSigmaPr (),
626+ track.trdSignal ());
627+ } else {
628+ trackBarrelPID (track.tpcSignal (),
629+ nSigmaEl, -1 , nSigmaPi, nSigmaKa, nSigmaPr,
630+ -1 ,
631+ track.tofNSigmaEl (), -1 , track.tofNSigmaPi (), track.tofNSigmaKa (), track.tofNSigmaPr (),
632+ -1 );
633+ }
620634 }
621635 if constexpr (static_cast <bool >(TTrackFillMap & VarManager::ObjTypes::TrackTPCPID)) {
622636 trackBarrelPID (track.tpcSignal (), track.tpcNSigmaEl (), -1 , track.tpcNSigmaPi (), track.tpcNSigmaKa (), track.tpcNSigmaPr (),
@@ -1054,11 +1068,19 @@ struct TableMaker {
10541068 float nSigmaEl = (fConfigComputeTPCpostCalib ? VarManager::fgValues[VarManager::kTPCnSigmaEl_Corr ] : track.tpcNSigmaEl ());
10551069 float nSigmaPi = (fConfigComputeTPCpostCalib ? VarManager::fgValues[VarManager::kTPCnSigmaPi_Corr ] : track.tpcNSigmaPi ());
10561070 float nSigmaPr = (fConfigComputeTPCpostCalib ? VarManager::fgValues[VarManager::kTPCnSigmaPr_Corr ] : track.tpcNSigmaPr ());
1057- trackBarrelPID (track.tpcSignal (),
1058- nSigmaEl, track.tpcNSigmaMu (), nSigmaPi, track.tpcNSigmaKa (), nSigmaPr,
1059- track.beta (),
1060- track.tofNSigmaEl (), track.tofNSigmaMu (), track.tofNSigmaPi (), track.tofNSigmaKa (), track.tofNSigmaPr (),
1061- track.trdSignal ());
1071+ if constexpr (static_cast <bool >(TTrackFillMap & VarManager::ObjTypes::TrackPIDExtra)) {
1072+ trackBarrelPID (track.tpcSignal (),
1073+ nSigmaEl, track.tpcNSigmaMu (), nSigmaPi, track.tpcNSigmaKa (), nSigmaPr,
1074+ track.beta (),
1075+ track.tofNSigmaEl (), track.tofNSigmaMu (), track.tofNSigmaPi (), track.tofNSigmaKa (), track.tofNSigmaPr (),
1076+ track.trdSignal ());
1077+ } else {
1078+ trackBarrelPID (track.tpcSignal (),
1079+ nSigmaEl, -1 , nSigmaPi, track.tpcNSigmaKa (), nSigmaPr,
1080+ -1 ,
1081+ track.tofNSigmaEl (), -1 , track.tofNSigmaPi (), track.tofNSigmaKa (), track.tofNSigmaPr (),
1082+ -1 );
1083+ }
10621084 }
10631085 if constexpr (static_cast <bool >(TTrackFillMap & VarManager::ObjTypes::TrackTPCPID)) {
10641086 trackBarrelPID (track.tpcSignal (), track.tpcNSigmaEl (), -1 , track.tpcNSigmaPi (), track.tpcNSigmaKa (), track.tpcNSigmaPr (),
@@ -1517,6 +1539,13 @@ struct TableMaker {
15171539 fullSkimming<gkEventFillMapWithMult, gkTrackFillMapWithCov, 0u >(collision, bcs, tracksBarrel, nullptr , nullptr , nullptr );
15181540 }
15191541
1542+ // Produce barrel tables only, with track cov matrix , only std PID information used ----------------------------------------------------------------------------------------
1543+ void processBarrelOnlyWithCovOnlyStdPID (MyEventsWithMults::iterator const & collision, aod::BCsWithTimestamps const & bcs,
1544+ soa::Filtered<MyBarrelTracksWithCovOnlyStdPID> const & tracksBarrel)
1545+ {
1546+ fullSkimming<gkEventFillMapWithMult, gkTrackFillMapWithCovOnlyStdPID, 0u >(collision, bcs, tracksBarrel, nullptr , nullptr , nullptr );
1547+ }
1548+
15201549 // Produce barrel tables only ----------------------------------------------------------------------------------------------------------------
15211550 void processBarrelOnly (MyEvents::iterator const & collision, aod::BCsWithTimestamps const & bcs,
15221551 soa::Filtered<MyBarrelTracks> const & tracksBarrel)
@@ -1752,6 +1781,7 @@ struct TableMaker {
17521781 PROCESS_SWITCH (TableMaker, processBarrelOnlyWithCentAndMults, " Build barrel-only DQ skimmed data model, w/ centrality and multiplicities" , false );
17531782 PROCESS_SWITCH (TableMaker, processBarrelOnlyWithCovWithCentAndMults, " Build barrel-only DQ skimmed data model, w/ centrality and multiplicities and w/ track covariance" , false );
17541783 PROCESS_SWITCH (TableMaker, processBarrelOnlyWithCov, " Build barrel-only DQ skimmed data model, w/ track cov matrix" , false );
1784+ PROCESS_SWITCH (TableMaker, processBarrelOnlyWithCovOnlyStdPID, " Build barrel-only DQ skimmed data model, w/ track cov matrix, only std PID information used" , false );
17551785 PROCESS_SWITCH (TableMaker, processBarrelOnly, " Build barrel-only DQ skimmed data model, w/o centrality" , false );
17561786 PROCESS_SWITCH (TableMaker, processMuonOnlyWithCovAndCent, " Build muon-only DQ skimmed data model, w/ centrality and muon cov matrix" , false );
17571787 PROCESS_SWITCH (TableMaker, processMuonOnlyWithCov, " Build muon-only DQ skimmed data model, w/ muon cov matrix" , false );
0 commit comments