diff --git a/PWGMM/Mult/Tasks/dndeta-mft-pbpb.cxx b/PWGMM/Mult/Tasks/dndeta-mft-pbpb.cxx index a800b3a1002..913fa96ea94 100644 --- a/PWGMM/Mult/Tasks/dndeta-mft-pbpb.cxx +++ b/PWGMM/Mult/Tasks/dndeta-mft-pbpb.cxx @@ -259,7 +259,7 @@ struct PseudorapidityDensityMFT { {HistType::kTH3F, {PhiAxis, EtaAxis, CentAxis}}}); QAregistry.add({"Events/Centrality/hcentFT0C", " ; cent FT0C", - {HistType::kTH1F, {{1000, 0, 100}}}, + {HistType::kTH1F, {CentAxis}}, true}); QAregistry.add( {"Tracks/Centrality/Chi2Eta", @@ -505,11 +505,6 @@ struct PseudorapidityDensityMFT { } } - /// Filters - collision - Filter filterCollCent = nabs(aod::cent::centFT0C) < cfgCutCent; - Filter filterCollZvtx = nabs(aod::collision::posZ) < cfgCutZvtx; - Filter filterMcCollZvtx = nabs(aod::mccollision::posZ) < cfgCutZvtx; - /// Filters - tracks Filter filtTrkEta = (aod::fwdtrack::eta < trkcuts.cfg_eta_max) && (aod::fwdtrack::eta > trkcuts.cfg_eta_min); @@ -536,28 +531,9 @@ struct PseudorapidityDensityMFT { using MFTTracksLabeled = soa::Join; /// Filtered tables - using filtColls = soa::Filtered>; - using filtColl = - soa::Filtered>::iterator; - using filtCollsCent = - soa::Filtered>; - using filtCollCent = soa::Filtered< - soa::Join>::iterator; - using CollsGenCentSmallG = - o2::soa::SmallGroups>; - using filtCollsGenCentSmallG = - soa::SmallGroups>; - using filtCollsGenCent = - soa::Filtered>; - using filtMcGenColls = soa::Filtered; - using filtMcGenColl = soa::Filtered::iterator; using filtMftTracks = soa::Filtered; using filtMcMftTracks = soa::Filtered; using filtBestTracks = soa::Filtered; - using filtBestTracksJ = - soa::Filtered>; using filtParticles = soa::Filtered; template @@ -921,20 +897,20 @@ struct PseudorapidityDensityMFT { } /// @brief process fnc. to run on DATA and REC MC w/o centrality selection - void processDataInclusive(filtColls::iterator const& collision, + void processDataInclusive(Colls::iterator const& collision, filtMftTracks const& tracks) { - processData(collision, tracks); + processData(collision, tracks); } PROCESS_SWITCH(PseudorapidityDensityMFT, processDataInclusive, "Count tracks", false); /// @brief process fnc. to run on DATA and REC MC w/ FT0C centrality selection - void processDataCent(filtCollsCent::iterator const& collision, + void processDataCent(CollsCent::iterator const& collision, filtMftTracks const& tracks) { - processData(collision, tracks); + processData(collision, tracks); } PROCESS_SWITCH(PseudorapidityDensityMFT, processDataCent, @@ -943,10 +919,10 @@ struct PseudorapidityDensityMFT { /// @brief process fnc. to run on DATA and REC MC based on BestCollisionsFwd /// table w/o centrality selection void processDatawBestTracksInclusive( - filtColls::iterator const& collision, filtMftTracks const& tracks, + Colls::iterator const& collision, filtMftTracks const& tracks, soa::SmallGroups const& besttracks) { - processDatawBestTracks(collision, tracks, besttracks); + processDatawBestTracks(collision, tracks, besttracks); } PROCESS_SWITCH(PseudorapidityDensityMFT, processDatawBestTracksInclusive, @@ -955,10 +931,10 @@ struct PseudorapidityDensityMFT { /// @brief process fnc. to run on DATA and REC MC based on BestCollisionsFwd /// table w/ FT0C centrality selection void processDatawBestTracksCent( - filtCollsCent::iterator const& collision, filtMftTracks const& tracks, + CollsCent::iterator const& collision, filtMftTracks const& tracks, soa::SmallGroups const& besttracks) { - processDatawBestTracks(collision, tracks, besttracks); + processDatawBestTracks(collision, tracks, besttracks); } PROCESS_SWITCH(PseudorapidityDensityMFT, processDatawBestTracksCent, @@ -1077,12 +1053,12 @@ struct PseudorapidityDensityMFT { /// @brief process fnc. to run on MC w/o centrality selection void processMCInclusive( - filtMcGenColls::iterator const& mccollision, - soa::SmallGroups> const& collisions, + aod::McCollisions::iterator const& mccollision, + soa::SmallGroups> const& collisions, filtParticles const& particles, filtMcMftTracks const& tracks) { - processMC(mccollision, collisions, particles, - tracks); + processMC(mccollision, collisions, particles, + tracks); } PROCESS_SWITCH(PseudorapidityDensityMFT, processMCInclusive, @@ -1090,12 +1066,12 @@ struct PseudorapidityDensityMFT { /// @brief process fnc. to run on MC w FT0C centrality selection void processMCCent( - filtMcGenColls::iterator const& mccollision, - soa::SmallGroups> const& collisions, + aod::McCollisions::iterator const& mccollision, + soa::SmallGroups> const& collisions, filtParticles const& particles, filtMcMftTracks const& tracks) { - processMC(mccollision, collisions, particles, - tracks); + processMC(mccollision, collisions, particles, + tracks); } PROCESS_SWITCH(PseudorapidityDensityMFT, processMCCent, @@ -1189,14 +1165,14 @@ struct PseudorapidityDensityMFT { /// @brief process fnc. to run on MC (inclusive, using aod::BestCollisionsFwd /// tracks) void processMCwBestTracksInclusive( - filtMcGenColls::iterator const& mccollision, - soa::SmallGroups> const& collisions, + aod::McCollisions::iterator const& mccollision, + soa::SmallGroups> const& collisions, filtParticles const& particles, filtMcMftTracks const& tracks, // aod::BestCollisionsFwd const // &besttracks filtBestTracks const& besttracks) { - processMCwBestTracks( + processMCwBestTracks( mccollision, collisions, particles, tracks, besttracks); } @@ -1206,12 +1182,12 @@ struct PseudorapidityDensityMFT { /// @brief process fnc. to run on MC (FT0C centrality, using /// aod::BestCollisionsFwd tracks) void processMCwBestTracksCent( - filtMcGenColls::iterator const& mccollision, - soa::SmallGroups> const& collisions, + aod::McCollisions::iterator const& mccollision, + soa::SmallGroups> const& collisions, filtParticles const& particles, filtMcMftTracks const& tracks, filtBestTracks const& besttracks) { - processMCwBestTracks( + processMCwBestTracks( mccollision, collisions, particles, tracks, besttracks); } @@ -1463,18 +1439,21 @@ struct PseudorapidityDensityMFT { template void processMcQA( typename soa::SmallGroups> const& collisions, - filtMcGenColls const& mcCollisions, filtParticles const& /*particles*/, - MFTTracksLabeled const& tracks, aod::AmbiguousMFTTracks const& atracks) + aod::McCollisions const& mcCollisions, + filtParticles const& /*particles*/, MFTTracksLabeled const& tracks, + aod::AmbiguousMFTTracks const& atracks) { for (const auto& collision : collisions) { float c_rec = -1; if constexpr (C::template contains()) { c_rec = collision.centFT0C(); - QAregistry.fill(HIST("Events/Centrality/hRecPerGenColls"), - static_cast(collisions.size()) / mcCollisions.size(), c_rec); + QAregistry.fill( + HIST("Events/Centrality/hRecPerGenColls"), + static_cast(collisions.size()) / mcCollisions.size(), c_rec); } else { QAregistry.fill(HIST("Events/hRecPerGenColls"), - static_cast(collisions.size()) / mcCollisions.size()); + static_cast(collisions.size()) / + mcCollisions.size()); } if (!isGoodEvent(collision)) { @@ -1506,12 +1485,11 @@ struct PseudorapidityDensityMFT { /// @brief process function for QA checks (inclusive) void processMcQAInclusive( - soa::SmallGroups> const& collisions, - filtMcGenColls const& mcCollisions, filtParticles const& particles, + soa::SmallGroups> const& collisions, + aod::McCollisions const& mcCollisions, filtParticles const& particles, MFTTracksLabeled const& tracks, aod::AmbiguousMFTTracks const& atracks) { - processMcQA(collisions, mcCollisions, particles, tracks, - atracks); + processMcQA(collisions, mcCollisions, particles, tracks, atracks); } PROCESS_SWITCH(PseudorapidityDensityMFT, processMcQAInclusive, @@ -1519,12 +1497,12 @@ struct PseudorapidityDensityMFT { /// @brief process function for QA checks (in FT0 bins) void processMcQACent( - soa::SmallGroups> const& collisions, - filtMcGenColls const& mcCollisions, filtParticles const& particles, + soa::SmallGroups> const& collisions, + aod::McCollisions const& mcCollisions, filtParticles const& particles, MFTTracksLabeled const& tracks, aod::AmbiguousMFTTracks const& atracks) { - processMcQA(collisions, mcCollisions, particles, tracks, - atracks); + processMcQA(collisions, mcCollisions, particles, tracks, + atracks); } PROCESS_SWITCH(PseudorapidityDensityMFT, processMcQACent,