@@ -79,22 +79,16 @@ using MyBarrelTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA,
7979 aod::McTrackLabels>;
8080using MyBarrelTracksWithDalitzBits = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection,
8181 aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi,
82- aod::pidTPCFullKa, aod::pidTPCFullPr,
82+ aod::pidTPCFullKa, aod::pidTPCFullPr, aod::mcTPCTuneOnData,
8383 aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
8484 aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta,
8585 aod::McTrackLabels, aod::DalitzBits>;
8686using MyBarrelTracksWithCov = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov, aod::TracksDCA, aod::TrackSelection,
8787 aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi,
88- aod::pidTPCFullKa, aod::pidTPCFullPr,
88+ aod::pidTPCFullKa, aod::pidTPCFullPr, aod::mcTPCTuneOnData,
8989 aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
9090 aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta,
9191 aod::McTrackLabels>;
92- using MyBarrelTracksTunedWithCov = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksCov, aod::TracksDCA, aod::TrackSelection,
93- aod::pidTPCFullEl, aod::pidTPCFullMu, aod::pidTPCFullPi,
94- aod::pidTPCFullKa, aod::pidTPCFullPr, aod::mcTPCTuneOnData,
95- aod::pidTOFFullEl, aod::pidTOFFullMu, aod::pidTOFFullPi,
96- aod::pidTOFFullKa, aod::pidTOFFullPr, aod::pidTOFbeta,
97- aod::McTrackLabels>;
9892using MyMuons = soa::Join<aod::FwdTracks, aod::McFwdTrackLabels, aod::FwdTracksDCA>;
9993using MyMuonsWithCov = soa::Join<aod::FwdTracks, aod::FwdTracksCov, aod::McFwdTrackLabels, aod::FwdTracksDCA>;
10094using MyMuonsRealignWithCov = soa::Join<aod::FwdTracksReAlign, aod::FwdTrksCovReAlign, aod::McFwdTrackLabels, aod::FwdTracksDCA>;
@@ -116,8 +110,7 @@ constexpr static uint32_t gkEventFillMapWithMultsRapidityGapFilter = VarManager:
116110constexpr static uint32_t gkEventMcFillMap = VarManager::ObjTypes::CollisionMC;
117111constexpr static uint32_t gkEventMcFillMapWithCent = VarManager::ObjTypes::CollisionMC | VarManager::ObjTypes::CollisionCent;
118112// constexpr static uint32_t gkTrackFillMap = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackPID;
119- constexpr static uint32_t gkTrackFillMapWithCov = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackCov | VarManager::ObjTypes::TrackPID;
120- constexpr static uint32_t gkTrackFillMapTunedWithCov = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackCov | VarManager::ObjTypes::TrackPID | VarManager::ObjTypes::MCTPCtuneOnData;
113+ constexpr static uint32_t gkTrackFillMapWithCov = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackCov | VarManager::ObjTypes::TrackPID | VarManager::ObjTypes::MCTPCtuneOnData;
121114// constexpr static uint32_t gkTrackFillMapWithDalitzBits = gkTrackFillMap | VarManager::ObjTypes::DalitzBits;
122115// constexpr static uint32_t gkMuonFillMap = VarManager::ObjTypes::Muon;
123116constexpr static uint32_t gkMuonFillMapWithCov = VarManager::ObjTypes::Muon | VarManager::ObjTypes::MuonCov;
@@ -270,7 +263,7 @@ struct TableMakerMC {
270263 {
271264 // Check whether barrel or muon are enabled
272265 bool isProcessBCenabled = context.mOptions .get <bool >(" processPP" );
273- bool isBarrelEnabled = (context.mOptions .get <bool >(" processPP" ) || context.mOptions .get <bool >(" processPPBarrelOnly" ) || context.mOptions .get <bool >(" processPPBarrelOnlyMcTuned " ) || context. mOptions . get < bool >( " processPbPbBarrelOnly" ) || context.mOptions .get <bool >(" processPbPbWithFilterBarrelOnly" ));
266+ bool isBarrelEnabled = (context.mOptions .get <bool >(" processPP" ) || context.mOptions .get <bool >(" processPPBarrelOnly" ) || context.mOptions .get <bool >(" processPbPbBarrelOnly" ) || context.mOptions .get <bool >(" processPbPbWithFilterBarrelOnly" ));
274267 bool isMuonEnabled = (context.mOptions .get <bool >(" processPP" ) || context.mOptions .get <bool >(" processPPMuonOnlyBasic" ) || context.mOptions .get <bool >(" processPPMuonOnly" ) || context.mOptions .get <bool >(" processPPRealignedMuonOnly" ) || context.mOptions .get <bool >(" processPbPbMuonOnly" ) || context.mOptions .get <bool >(" processPbPbRealignedMuonOnly" )) || context.mOptions .get <bool >(" processPPMuonRefit" );
275268 // Make sure at least one process function is enabled
276269 if (!(isProcessBCenabled || isBarrelEnabled || isMuonEnabled)) {
@@ -1463,28 +1456,13 @@ struct TableMakerMC {
14631456 fullSkimming<gkEventFillMapWithMults, gkTrackFillMapWithCov, gkMuonFillMapWithCov, gkMFTFillMap, gkEventMcFillMap>(collisions, bcs, tracksBarrel, tracksMuon, mftTracks, trackAssocs, fwdTrackAssocs, mftAssocs, mcCollisions, mcParticles, nullptr );
14641457 }
14651458
1466- void processPPMcTuned (MyEventsWithMults const & collisions, aod::BCsWithTimestamps const & bcs,
1467- MyBarrelTracksTunedWithCov const & tracksBarrel, MyMuonsWithCov const & tracksMuon, MFTTrackLabeled const & mftTracks,
1468- aod::TrackAssoc const & trackAssocs, aod::FwdTrackAssoc const & fwdTrackAssocs, aod::MFTTrackAssoc const & mftAssocs,
1469- MyEventsMcWithMults const & mcCollisions, aod::McParticles const & mcParticles)
1470- {
1471- fullSkimming<gkEventFillMapWithMults, gkTrackFillMapTunedWithCov, gkMuonFillMapWithCov, gkMFTFillMap, gkEventMcFillMap>(collisions, bcs, tracksBarrel, tracksMuon, mftTracks, trackAssocs, fwdTrackAssocs, mftAssocs, mcCollisions, mcParticles, nullptr );
1472- }
1473-
14741459 void processPPBarrelOnly (MyEventsWithMults const & collisions, aod::BCsWithTimestamps const & bcs,
14751460 MyBarrelTracksWithCov const & tracksBarrel, aod::TrackAssoc const & trackAssocs,
14761461 MyEventsMcWithMults const & mcCollisions, aod::McParticles const & mcParticles)
14771462 {
14781463 fullSkimming<gkEventFillMapWithMults, gkTrackFillMapWithCov, 0u , 0u , gkEventMcFillMap>(collisions, bcs, tracksBarrel, nullptr , nullptr , trackAssocs, nullptr , nullptr , mcCollisions, mcParticles, nullptr );
14791464 }
14801465
1481- void processPPBarrelOnlyMcTuned (MyEventsWithMults const & collisions, aod::BCsWithTimestamps const & bcs,
1482- MyBarrelTracksTunedWithCov const & tracksBarrel, aod::TrackAssoc const & trackAssocs,
1483- MyEventsMcWithMults const & mcCollisions, aod::McParticles const & mcParticles)
1484- {
1485- fullSkimming<gkEventFillMapWithMults, gkTrackFillMapTunedWithCov, 0u , 0u , gkEventMcFillMap>(collisions, bcs, tracksBarrel, nullptr , nullptr , trackAssocs, nullptr , nullptr , mcCollisions, mcParticles, nullptr );
1486- }
1487-
14881466 void processPPMuonOnlyBasic (MyEvents const & collisions, aod::BCsWithTimestamps const & bcs,
14891467 MyMuonsWithCov const & tracksMuon, MFTTrackLabeled const & mftTracks,
14901468 aod::FwdTrackAssoc const & fwdTrackAssocs, aod::MFTTrackAssoc const & mftAssocs,
@@ -1525,28 +1503,13 @@ struct TableMakerMC {
15251503 fullSkimming<gkEventFillMapWithCentAndMults, gkTrackFillMapWithCov, gkMuonFillMapWithCov, gkMFTFillMap, gkEventMcFillMapWithCent>(collisions, bcs, tracksBarrel, tracksMuon, mftTracks, trackAssocs, fwdTrackAssocs, mftAssocs, mcCollisions, mcParticles, nullptr );
15261504 }
15271505
1528- void processPbPbMcTuned (MyEventsWithCentAndMults const & collisions, aod::BCsWithTimestamps const & bcs,
1529- MyBarrelTracksTunedWithCov const & tracksBarrel, MyMuonsWithCov const & tracksMuon, MFTTrackLabeled const & mftTracks,
1530- aod::TrackAssoc const & trackAssocs, aod::FwdTrackAssoc const & fwdTrackAssocs, aod::MFTTrackAssoc const & mftAssocs,
1531- MyEventsMcWithMults const & mcCollisions, aod::McParticles const & mcParticles)
1532- {
1533- fullSkimming<gkEventFillMapWithCentAndMults, gkTrackFillMapTunedWithCov, gkMuonFillMapWithCov, gkMFTFillMap, gkEventMcFillMapWithCent>(collisions, bcs, tracksBarrel, tracksMuon, mftTracks, trackAssocs, fwdTrackAssocs, mftAssocs, mcCollisions, mcParticles, nullptr );
1534- }
1535-
15361506 void processPbPbBarrelOnly (MyEventsWithCentAndMults const & collisions, aod::BCsWithTimestamps const & bcs,
15371507 MyBarrelTracksWithCov const & tracksBarrel, aod::TrackAssoc const & trackAssocs,
15381508 MyEventsMcWithMults const & mcCollisions, aod::McParticles const & mcParticles)
15391509 {
15401510 fullSkimming<gkEventFillMapWithCentAndMults, gkTrackFillMapWithCov, 0u , 0u , gkEventMcFillMapWithCent>(collisions, bcs, tracksBarrel, nullptr , nullptr , trackAssocs, nullptr , nullptr , mcCollisions, mcParticles, nullptr );
15411511 }
15421512
1543- void processPbPbBarrelOnlyMcTuned (MyEventsWithCentAndMults const & collisions, aod::BCsWithTimestamps const & bcs,
1544- MyBarrelTracksTunedWithCov const & tracksBarrel, aod::TrackAssoc const & trackAssocs,
1545- MyEventsMcWithMults const & mcCollisions, aod::McParticles const & mcParticles)
1546- {
1547- fullSkimming<gkEventFillMapWithCentAndMults, gkTrackFillMapTunedWithCov, 0u , 0u , gkEventMcFillMapWithCent>(collisions, bcs, tracksBarrel, nullptr , nullptr , trackAssocs, nullptr , nullptr , mcCollisions, mcParticles, nullptr );
1548- }
1549-
15501513 void processPbPbWithFilterBarrelOnly (MyEventsWithMultsAndRapidityGapFilter const & collisions, aod::BCsWithTimestamps const & bcs,
15511514 MyBarrelTracksWithCov const & tracksBarrel, aod::TrackAssoc const & trackAssocs,
15521515 MyEventsMcWithMults const & mcCollisions, aod::McParticles const & mcParticles)
@@ -1598,17 +1561,13 @@ struct TableMakerMC {
15981561 }
15991562
16001563 PROCESS_SWITCH (TableMakerMC, processPP, " Produce both barrel and muon skims, pp settings" , false );
1601- PROCESS_SWITCH (TableMakerMC, processPPMcTuned, " Produce both barrel and muon skims, pp settings, with MC-tuned dEdx" , false );
16021564 PROCESS_SWITCH (TableMakerMC, processPPBarrelOnly, " Produce only barrel skims, pp settings " , false );
1603- PROCESS_SWITCH (TableMakerMC, processPPBarrelOnlyMcTuned, " Produce only barrel skims, pp settings, with MC-tuned dEdx" , false );
16041565 PROCESS_SWITCH (TableMakerMC, processPPMuonOnlyBasic, " Produce only muon skims, pp settings, no multiplicity" , false );
16051566 PROCESS_SWITCH (TableMakerMC, processPPMuonOnly, " Produce only muon skims, pp settings" , false );
16061567 PROCESS_SWITCH (TableMakerMC, processPPMuonRefit, " Produce only muon skims, pp settings" , false );
16071568 PROCESS_SWITCH (TableMakerMC, processPPRealignedMuonOnly, " Build realigned muon only DQ skimmed data model typically for pp/p-Pb and UPC Pb-Pb" , false );
16081569 PROCESS_SWITCH (TableMakerMC, processPbPb, " Produce both barrel and muon skims, PbPb settings" , false );
1609- PROCESS_SWITCH (TableMakerMC, processPbPbMcTuned, " Produce both barrel and muon skims, PbPb settings, with MC-tuned dEdx" , false );
16101570 PROCESS_SWITCH (TableMakerMC, processPbPbBarrelOnly, " Produce only barrel skims, PbPb settings" , false );
1611- PROCESS_SWITCH (TableMakerMC, processPbPbBarrelOnlyMcTuned, " Produce only barrel skims, PbPb settings, with MC-tuned dEdx" , false );
16121571 PROCESS_SWITCH (TableMakerMC, processPbPbWithFilterBarrelOnly, " Produce only barrel skims, pp settings with rapidity gap filter " , false );
16131572 PROCESS_SWITCH (TableMakerMC, processPbPbMuonOnly, " Produce only muon skims, PbPb settings" , false );
16141573 PROCESS_SWITCH (TableMakerMC, processPbPbRealignedMuonOnly, " Build realigned muon only DQ skimmed data model typically for Pb-Pb, w/o event filtering" , false );
0 commit comments