diff --git a/PWGCF/GenericFramework/Tasks/flowGfwV02.cxx b/PWGCF/GenericFramework/Tasks/flowGfwV02.cxx index 095dc79a167..fafcdf58c3e 100644 --- a/PWGCF/GenericFramework/Tasks/flowGfwV02.cxx +++ b/PWGCF/GenericFramework/Tasks/flowGfwV02.cxx @@ -180,7 +180,7 @@ struct FlowGfwV02 { // // The analysis assumes the data has been subjected to a QA of its selection, // // and thus only the final distributions of the data for analysis are saved. o2::framework::expressions::Filter collFilter = (nabs(aod::collision::posZ) < cfgEventCuts.cfgZvtxMax); - o2::framework::expressions::Filter trackFilter = (aod::track::pt > cfgTrackCuts.cfgPtMin) && (aod::track::pt < cfgTrackCuts.cfgPtMax) && (nabs(aod::track::eta) < cfgTrackCuts.cfgEtaMax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && (aod::track::itsChi2NCl < cfgTrackCuts.cfgChi2PrITSCls) && (aod::track::tpcChi2NCl < cfgTrackCuts.cfgChi2PrTPCCls) && nabs(aod::track::dcaZ) < cfgTrackCuts.cfgDCAz); + o2::framework::expressions::Filter trackFilter = (aod::track::pt > cfgTrackCuts.cfgPtMin) && (aod::track::pt < cfgTrackCuts.cfgPtMax) && (nabs(aod::track::eta) < cfgTrackCuts.cfgEtaMax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t)true)) && (aod::track::itsChi2NCl < cfgTrackCuts.cfgChi2PrITSCls) && (aod::track::tpcChi2NCl < cfgTrackCuts.cfgChi2PrTPCCls) && nabs(aod::track::dcaZ) < cfgTrackCuts.cfgDCAz); // Connect to ccdb Service ccdb; @@ -224,7 +224,6 @@ struct FlowGfwV02 { kTrackCent }; - std::unique_ptr fGFW{std::make_unique()}; std::unique_ptr fRndm{std::make_unique(0)}; std::unique_ptr fSecondAxis{nullptr}; @@ -247,7 +246,6 @@ struct FlowGfwV02 { }; PIDState pidStates; - // Event selection cuts - Alex TF1* fMultPVCutLow = nullptr; TF1* fMultPVCutHigh = nullptr; @@ -384,7 +382,6 @@ struct FlowGfwV02 { AxisSpec dcaZAxis = {200, -2, 2, "DCA_{z} (cm)"}; AxisSpec dcaXYAxis = {200, -0.5, 0.5, "DCA_{xy} (cm)"}; - registry.add("v02pt", "", {HistType::kTProfile2D, {ptAxis, centAxis}}); registry.add("nchMid", "", {HistType::kTProfile2D, {ptAxis, centAxis}}); @@ -652,7 +649,6 @@ struct FlowGfwV02 { return 1. / eff; } - template void fillNsigmaAfterCut(TTrack track1, Int_t pid) // function to fill the QA after Nsigma selection { @@ -702,7 +698,6 @@ struct FlowGfwV02 { } // end of switch } - template bool eventSelected(TCollision collision, const int& multTrk, const float& centrality, const int& run) { @@ -980,7 +975,6 @@ struct FlowGfwV02 { return ((track.tpcNClsCrossedRows() >= cfgTrackCuts.cfgNTPCXrows) && (track.tpcNClsFound() >= cfgTrackCuts.cfgNTPCCls) && (track.itsNCls() >= cfgTrackCuts.cfgMinNITSCls)); } - template float getCentrality(TCollision collision) { @@ -1004,15 +998,14 @@ struct FlowGfwV02 { } } - template inline void processTrack(TTrack const& track, const float& vtxz, const int& multiplicity, const int& /*run*/, AcceptedTracks& acceptedTracks) { - + if (cfgFillQA) { fillTrackQA(track, vtxz); registry.fill(HIST("trackQA/before/nch_pt"), multiplicity, track.pt()); - } + } if (!trackSelected(track)) return; @@ -1093,7 +1086,6 @@ struct FlowGfwV02 { return; } - double getTimeSinceStartOfFill(uint64_t, int) { return 0.0; } void processData(soa::Filtered>::iterator const& collision, aod::BCsWithTimestamps const&, GFWTracks const& tracks) @@ -1119,13 +1111,12 @@ struct FlowGfwV02 { registry.fill(HIST("eventQA/before/centrality"), xaxis.centrality); registry.fill(HIST("eventQA/before/multiplicity"), xaxis.multiplicity); } - + if (cfgUseAdditionalEventCut && !eventSelected(collision, xaxis.multiplicity, xaxis.centrality, run)) return; if (cfgFillQA) fillEventQA(collision, xaxis); - registry.fill(HIST("eventQA/after/centrality"), xaxis.centrality); registry.fill(HIST("eventQA/after/multiplicity"), xaxis.multiplicity); processCollision(collision, tracks, xaxis, run);