@@ -89,6 +89,12 @@ using MyBarrelTracksWithCov = soa::Join<aod::Tracks, aod::TracksExtra, aod::Trac
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>;
9298using MyMuons = soa::Join<aod::FwdTracks, aod::McFwdTrackLabels, aod::FwdTracksDCA>;
9399using MyMuonsWithCov = soa::Join<aod::FwdTracks, aod::FwdTracksCov, aod::McFwdTrackLabels, aod::FwdTracksDCA>;
94100using MyMuonsRealignWithCov = soa::Join<aod::FwdTracksReAlign, aod::FwdTrksCovReAlign, aod::McFwdTrackLabels, aod::FwdTracksDCA>;
@@ -111,6 +117,7 @@ constexpr static uint32_t gkEventMcFillMap = VarManager::ObjTypes::CollisionMC;
111117constexpr static uint32_t gkEventMcFillMapWithCent = VarManager::ObjTypes::CollisionMC | VarManager::ObjTypes::CollisionCent;
112118// constexpr static uint32_t gkTrackFillMap = VarManager::ObjTypes::Track | VarManager::ObjTypes::TrackExtra | VarManager::ObjTypes::TrackDCA | VarManager::ObjTypes::TrackSelection | VarManager::ObjTypes::TrackPID;
113119constexpr 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;
114121// constexpr static uint32_t gkTrackFillMapWithDalitzBits = gkTrackFillMap | VarManager::ObjTypes::DalitzBits;
115122// constexpr static uint32_t gkMuonFillMap = VarManager::ObjTypes::Muon;
116123constexpr static uint32_t gkMuonFillMapWithCov = VarManager::ObjTypes::Muon | VarManager::ObjTypes::MuonCov;
@@ -263,7 +270,7 @@ struct TableMakerMC {
263270 {
264271 // Check whether barrel or muon are enabled
265272 bool isProcessBCenabled = context.mOptions .get <bool >(" processPP" );
266- bool isBarrelEnabled = (context.mOptions .get <bool >(" processPP" ) || context.mOptions .get <bool >(" processPPBarrelOnly" ) || context.mOptions .get <bool >(" processPbPbBarrelOnly" ) || context.mOptions .get <bool >(" processPbPbWithFilterBarrelOnly" ));
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" ));
267274 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" );
268275 // Make sure at least one process function is enabled
269276 if (!(isProcessBCenabled || isBarrelEnabled || isMuonEnabled)) {
@@ -1449,20 +1456,35 @@ struct TableMakerMC {
14491456 }
14501457
14511458 void processPP (MyEventsWithMults const & collisions, aod::BCsWithTimestamps const & bcs,
1452- MyBarrelTracksWithCov const & tracksBarrel, MyMuonsWithCov const & tracksMuon, MFTTrackLabeled const & mftTracks,
1459+ MyBarrelTracksTunedWithCov const & tracksBarrel, MyMuonsWithCov const & tracksMuon, MFTTrackLabeled const & mftTracks,
14531460 aod::TrackAssoc const & trackAssocs, aod::FwdTrackAssoc const & fwdTrackAssocs, aod::MFTTrackAssoc const & mftAssocs,
14541461 MyEventsMcWithMults const & mcCollisions, aod::McParticles const & mcParticles)
14551462 {
14561463 fullSkimming<gkEventFillMapWithMults, gkTrackFillMapWithCov, gkMuonFillMapWithCov, gkMFTFillMap, gkEventMcFillMap>(collisions, bcs, tracksBarrel, tracksMuon, mftTracks, trackAssocs, fwdTrackAssocs, mftAssocs, mcCollisions, mcParticles, nullptr );
14571464 }
14581465
1466+ void processPPMcTuned (MyEventsWithMults const & collisions, aod::BCsWithTimestamps const & bcs,
1467+ MyBarrelTracksWithCov 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+
14591474 void processPPBarrelOnly (MyEventsWithMults const & collisions, aod::BCsWithTimestamps const & bcs,
14601475 MyBarrelTracksWithCov const & tracksBarrel, aod::TrackAssoc const & trackAssocs,
14611476 MyEventsMcWithMults const & mcCollisions, aod::McParticles const & mcParticles)
14621477 {
14631478 fullSkimming<gkEventFillMapWithMults, gkTrackFillMapWithCov, 0u , 0u , gkEventMcFillMap>(collisions, bcs, tracksBarrel, nullptr , nullptr , trackAssocs, nullptr , nullptr , mcCollisions, mcParticles, nullptr );
14641479 }
14651480
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+
14661488 void processPPMuonOnlyBasic (MyEvents const & collisions, aod::BCsWithTimestamps const & bcs,
14671489 MyMuonsWithCov const & tracksMuon, MFTTrackLabeled const & mftTracks,
14681490 aod::FwdTrackAssoc const & fwdTrackAssocs, aod::MFTTrackAssoc const & mftAssocs,
0 commit comments