From 157ace6cbcdbc44f5c8ed404fc8ccd3a811efd8f Mon Sep 17 00:00:00 2001 From: cnkoster Date: Fri, 20 Nov 2026 14:35:18 +0100 Subject: [PATCH 1/4] Move axis eta to config and add eventselectionmatrix in QA --- PWGCF/Flow/Tasks/flowSP.cxx | 554 +++++++++++++++++++++++------------- 1 file changed, 349 insertions(+), 205 deletions(-) diff --git a/PWGCF/Flow/Tasks/flowSP.cxx b/PWGCF/Flow/Tasks/flowSP.cxx index f15ac08fe19..1e6347762dd 100644 --- a/PWGCF/Flow/Tasks/flowSP.cxx +++ b/PWGCF/Flow/Tasks/flowSP.cxx @@ -168,6 +168,9 @@ struct FlowSP { Configurable> cEvSelsMult{"cEvSelsMult", std::vector{1301.56, -41.4615, 0.478224, -0.00239449, 4.46966e-06, 2967.6, -102.927, 1.47488, -0.0106534, 3.28622e-05}, "Multiplicity cuts (Global) first 5 parameters cutLOW last 5 cutHIGH (Default is +-2sigma pass5) "}; Configurable> cPtBinning{"cPtBinning", std::vector{0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2, 2.2, 2.4, 2.6, 2.8, 3, 3.5, 4, 5, 6, 8, 10}, "pT binning for vn"}; + ConfigurableAxis cAxisCentMC{"cAxisCentMC", {90, 0, 90}, "Configurable centrality axis -> Used for MC!"}; + ConfigurableAxis cAxisEtaMeanPt{"cAxisEtaMeanPt", {64, -0.8, 0.8}, "Configurableeta axis -> Used for mean pt! "}; + } cfg; RCTFlagsChecker rctChecker; @@ -352,9 +355,16 @@ struct FlowSP { nParticleTypes }; + enum SelectionType { + kEvent, + kTrack, + nSelectionTypes + }; + static constexpr std::array Charge = {"incl/", "pos/", "neg/"}; static constexpr std::array Species = {"", "pion/", "kaon/", "proton/"}; static constexpr std::array Time = {"before/", "after/"}; + static constexpr std::array Selections = {"Event", "Track"}; void init(InitContext const&) { @@ -372,11 +382,11 @@ struct FlowSP { AxisSpec axisPhi = {60, 0, constants::math::TwoPI, "#varphi"}; AxisSpec axisEta = {64, -1.6, 1.6, "#eta"}; AxisSpec axisEtaVn = {8, -.8, .8, "#eta"}; - AxisSpec axisCentrality = {20, 0, 100, "Centrality (%)"}; + AxisSpec axisCentralityFivePercent = {20, 0, 100, "Centrality (%)"}; + AxisSpec axisCentralityOnePercent = {90, 0, 90, "Centrality(%)"}; AxisSpec axisVx = {40, -0.01, 0.01, "v_{x}"}; AxisSpec axisVy = {40, -0.01, 0.01, "v_{y}"}; AxisSpec axisVz = {40, -10, 10, "v_{z}"}; - AxisSpec axisCent = {90, 0, 90, "Centrality(%)"}; AxisSpec axisPhiPlane = {100, -constants::math::PI, constants::math::PI, "#Psi"}; AxisSpec axisT0c = {70, 0, 100000, "N_{ch} (T0C)"}; AxisSpec axisT0a = {70, 0, 200000, "N_{ch} (T0A)"}; @@ -395,8 +405,8 @@ struct FlowSP { rctChecker.init(cfg.cEvtRCTFlagCheckerLabel, cfg.cEvtRCTFlagCheckerZDCCheck, cfg.cEvtRCTFlagCheckerLimitAcceptAsBad); - histos.add("hCentrality", "Centrality; Centrality (%); ", {HistType::kTH1D, {axisCent}}); - histos.add("hCentralityCW", "Centrality; Centrality (%); Weighted counts", {HistType::kTH1D, {axisCent}}); + histos.add("hCentrality", "Centrality; Centrality (%); ", {HistType::kTH1D, {axisCentralityOnePercent}}); + histos.add("hCentralityCW", "Centrality; Centrality (%); Weighted counts", {HistType::kTH1D, {axisCentralityOnePercent}}); histos.add("hEventCount", "Number of Event; Cut; #Events Passed Cut", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}}); histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_FilteredEvent + 1, "Filtered events"); @@ -409,11 +419,21 @@ struct FlowSP { histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kNoCollInTimeRangeNarrow + 1, "kNoCollInTimeRangeNarrow"); histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsVertexITSTPC + 1, "kIsVertexITSTPC"); histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_CentCuts + 1, "Cenrality range"); - histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodITSLayersAll + 1, "kkIsGoodITSLayersAll"); - histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodITSLayer0123 + 1, "kkIsGoodITSLayer0123"); + histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodITSLayersAll + 1, "kIsGoodITSLayersAll"); + histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_kIsGoodITSLayer0123 + 1, "kIsGoodITSLayer0123"); histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_MultCuts + 1, "Multiplicity Cuts Pilup"); histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_isSelectedZDC + 1, "isSelected"); + histos.add("hSingleEventRejection", "", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}}); + histos.add("hEventRejectionMatrix", "", {HistType::kTH2D, {{nEventSelections, 0, nEventSelections}, {nEventSelections, 0, nEventSelections}}}); + + for (int i = 1; i <= nEventSelections; i++) { + const char* label = histos.get(HIST("hEventCount"))->GetXaxis()->GetBinLabel(i); + histos.get(HIST("hEventRejectionMatrix"))->GetXaxis()->SetBinLabel(i, label); + histos.get(HIST("hEventRejectionMatrix"))->GetYaxis()->SetBinLabel(i, label); + histos.get(HIST("hSingleEventRejection"))->GetXaxis()->SetBinLabel(i, label); + } + histos.add("hTrackCount", "Number of Tracks; Cut; #Tracks Passed Cut", {HistType::kTH1D, {{nTrackSelections, 0, nTrackSelections}}}); histos.get(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_Eta + 1, "Eta"); histos.get(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_Pt + 1, "Pt"); @@ -426,6 +446,16 @@ struct FlowSP { histos.get(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_ZeroCharge + 1, "Only charged"); histos.get(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_ParticleWeights + 1, "Apply weights"); + histos.add("hSingleTrackRejection", "", {HistType::kTH1D, {{nTrackSelections, 0, nTrackSelections}}}); + histos.add("hTrackRejectionMatrix", "", {HistType::kTH2D, {{nTrackSelections, 0, nTrackSelections}, {nTrackSelections, 0, nTrackSelections}}}); + + for (int i = 1; i <= nTrackSelections; i++) { + const char* label = histos.get(HIST("hTrackCount"))->GetXaxis()->GetBinLabel(i); + histos.get(HIST("hTrackRejectionMatrix"))->GetXaxis()->SetBinLabel(i, label); + histos.get(HIST("hTrackRejectionMatrix"))->GetYaxis()->SetBinLabel(i, label); + histos.get(HIST("hSingleTrackRejection"))->GetXaxis()->SetBinLabel(i, label); + } + if (cfg.cFillWeights) { registry.add("weights2D/hPhi_Eta_vz", "", kTH3D, {axisPhi, axisEta, axisVz}); registry.add("weights2D/hPhi_Eta_vz_positive", "", kTH3D, {axisPhi, axisEta, axisVz}); @@ -443,26 +473,26 @@ struct FlowSP { } if (cfg.cFillEventQA) { - histos.add("QA/after/hCentFT0C", " ; Cent FT0C (%); ", {HistType::kTH1D, {axisCent}}); - histos.add("QA/after/hCentFT0M", "; Cent FT0M (%); ", {HistType::kTH1D, {axisCent}}); - histos.add("QA/after/hCentFV0A", "; Cent FV0A (%); ", {HistType::kTH1D, {axisCent}}); - histos.add("QA/after/hCentNGlobal", "; Cent NGlobal (%); ", {HistType::kTH1D, {axisCent}}); - histos.add("QA/after/globalTracks_centT0C", "", {HistType::kTH2D, {axisCent, axisNch}}); - histos.add("QA/after/PVTracks_centT0C", "", {HistType::kTH2D, {axisCent, axisMultpv}}); + histos.add("QA/after/hCentFT0C", " ; Cent FT0C (%); ", {HistType::kTH1D, {axisCentralityOnePercent}}); + histos.add("QA/after/hCentFT0M", "; Cent FT0M (%); ", {HistType::kTH1D, {axisCentralityOnePercent}}); + histos.add("QA/after/hCentFV0A", "; Cent FV0A (%); ", {HistType::kTH1D, {axisCentralityOnePercent}}); + histos.add("QA/after/hCentNGlobal", "; Cent NGlobal (%); ", {HistType::kTH1D, {axisCentralityOnePercent}}); + histos.add("QA/after/globalTracks_centT0C", "", {HistType::kTH2D, {axisCentralityOnePercent, axisNch}}); + histos.add("QA/after/PVTracks_centT0C", "", {HistType::kTH2D, {axisCentralityOnePercent, axisMultpv}}); histos.add("QA/after/globalTracks_PVTracks", "", {HistType::kTH2D, {axisMultpv, axisNch}}); histos.add("QA/after/globalTracks_multT0A", "", {HistType::kTH2D, {axisT0a, axisNch}}); histos.add("QA/after/globalTracks_multV0A", "", {HistType::kTH2D, {axisV0a, axisNch}}); histos.add("QA/after/multV0A_multT0A", "", {HistType::kTH2D, {axisT0a, axisV0a}}); - histos.add("QA/after/multT0C_centT0C", "", {HistType::kTH2D, {axisCent, axisT0c}}); - histos.add("QA/after/CentFT0C_vs_CentFT0Cvariant1", " ; Cent FT0C (%); Cent FT0Cvariant1 (%) ", {HistType::kTH2D, {axisCent, axisCent}}); - histos.add("QA/after/CentFT0C_vs_CentFT0M", " ; Cent FT0C (%); Cent FT0M (%) ", {HistType::kTH2D, {axisCent, axisCent}}); - histos.add("QA/after/CentFT0C_vs_CentFV0A", " ; Cent FT0C (%); Cent FV0A (%) ", {HistType::kTH2D, {axisCent, axisCent}}); - histos.add("QA/after/CentFT0C_vs_CentNGlobal", " ; Cent FT0C (%); Cent NGlobal (%) ", {HistType::kTH2D, {axisCent, axisCent}}); + histos.add("QA/after/multT0C_centT0C", "", {HistType::kTH2D, {axisCentralityOnePercent, axisT0c}}); + histos.add("QA/after/CentFT0C_vs_CentFT0Cvariant1", " ; Cent FT0C (%); Cent FT0Cvariant1 (%) ", {HistType::kTH2D, {axisCentralityOnePercent, axisCentralityOnePercent}}); + histos.add("QA/after/CentFT0C_vs_CentFT0M", " ; Cent FT0C (%); Cent FT0M (%) ", {HistType::kTH2D, {axisCentralityOnePercent, axisCentralityOnePercent}}); + histos.add("QA/after/CentFT0C_vs_CentFV0A", " ; Cent FT0C (%); Cent FV0A (%) ", {HistType::kTH2D, {axisCentralityOnePercent, axisCentralityOnePercent}}); + histos.add("QA/after/CentFT0C_vs_CentNGlobal", " ; Cent FT0C (%); Cent NGlobal (%) ", {HistType::kTH2D, {axisCentralityOnePercent, axisCentralityOnePercent}}); if (cfg.cFillEventPlaneQA && doprocessData) { - histos.add("QA/after/PsiA_vs_Cent", "", {HistType::kTH2D, {axisPhiPlane, axisCent}}); - histos.add("QA/after/PsiC_vs_Cent", "", {HistType::kTH2D, {axisPhiPlane, axisCent}}); - histos.add("QA/after/PsiFull_vs_Cent", "", {HistType::kTH2D, {axisPhiPlane, axisCent}}); + histos.add("QA/after/PsiA_vs_Cent", "", {HistType::kTH2D, {axisPhiPlane, axisCentralityOnePercent}}); + histos.add("QA/after/PsiC_vs_Cent", "", {HistType::kTH2D, {axisPhiPlane, axisCentralityOnePercent}}); + histos.add("QA/after/PsiFull_vs_Cent", "", {HistType::kTH2D, {axisPhiPlane, axisCentralityOnePercent}}); histos.add("QA/after/PsiA_vs_Vx", "", {HistType::kTH2D, {axisPhiPlane, axisVx}}); histos.add("QA/after/PsiC_vs_Vx", "", {HistType::kTH2D, {axisPhiPlane, axisVx}}); histos.add("QA/after/PsiFull_vs_Vx", "", {HistType::kTH2D, {axisPhiPlane, axisVx}}); @@ -490,13 +520,13 @@ struct FlowSP { histos.add("incl/QA/after/hSharedClusters_pt", "", {HistType::kTH2D, {axisPt, axisShCl}}); histos.add("incl/QA/after/hCrossedRows_pt", "", {HistType::kTH2D, {axisPt, axisCl}}); histos.add("incl/QA/after/hCrossedRows_vs_SharedClusters", "", {HistType::kTH2D, {axisCl, axisShCl}}); - histos.add("incl/QA/after/hMeanPtEta", "", {HistType::kTProfile2D, {axisEta, axisCent}}); + histos.add("incl/QA/after/hMeanPtEta", "", {HistType::kTProfile2D, {axisEta, axisCentralityOnePercent}}); if (cfg.cTrackSelDoTrackQAvsCent) { - histos.add("incl/QA/after/hPt_Eta", "", kTH3D, {axisPt, axisEta, axisCent}); - histos.add("incl/QA/after/hPt_Eta_uncorrected", "", kTH3D, {axisPt, axisEta, axisCent}); - histos.add("incl/QA/after/hPhi_Eta", "", kTH3D, {axisPhi, axisEta, axisCent}); - histos.add("incl/QA/after/hPhi_Eta_uncorrected", "", kTH3D, {axisPhi, axisEta, axisCent}); + histos.add("incl/QA/after/hPt_Eta", "", kTH3D, {axisPt, axisEta, axisCentralityFivePercent}); + histos.add("incl/QA/after/hPt_Eta_uncorrected", "", kTH3D, {axisPt, axisEta, axisCentralityFivePercent}); + histos.add("incl/QA/after/hPhi_Eta", "", kTH3D, {axisPhi, axisEta, axisCentralityFivePercent}); + histos.add("incl/QA/after/hPhi_Eta_uncorrected", "", kTH3D, {axisPhi, axisEta, axisCentralityFivePercent}); } else { histos.add("incl/QA/after/hPhi_Eta_Pt", "", kTH3D, {axisPhi, axisEta, axisPt}); histos.add("incl/QA/after/hPhi_Eta_Pt_corrected", "", kTH3D, {axisPhi, axisEta, axisPt}); @@ -523,10 +553,10 @@ struct FlowSP { histos.add("incl/pion/QA/after/hNsigmaTOF_pt", "", {HistType::kTH2D, {axisPt, axisNsigma}}); if (cfg.cTrackSelDoTrackQAvsCent) { - histos.add("incl/pion/QA/after/hPt_Eta", "", kTH3D, {axisPt, axisEta, axisCent}); - histos.add("incl/pion/QA/after/hPt_Eta_uncorrected", "", kTH3D, {axisPt, axisEta, axisCent}); - histos.add("incl/pion/QA/after/hPhi_Eta", "", kTH3D, {axisPhi, axisEta, axisCent}); - histos.add("incl/pion/QA/after/hPhi_Eta_uncorrected", "", kTH3D, {axisPhi, axisEta, axisCent}); + histos.add("incl/pion/QA/after/hPt_Eta", "", kTH3D, {axisPt, axisEta, axisCentralityFivePercent}); + histos.add("incl/pion/QA/after/hPt_Eta_uncorrected", "", kTH3D, {axisPt, axisEta, axisCentralityFivePercent}); + histos.add("incl/pion/QA/after/hPhi_Eta", "", kTH3D, {axisPhi, axisEta, axisCentralityFivePercent}); + histos.add("incl/pion/QA/after/hPhi_Eta_uncorrected", "", kTH3D, {axisPhi, axisEta, axisCentralityFivePercent}); } else { histos.add("incl/pion/QA/after/hPhi_Eta_Pt", "", kTH3D, {axisPhi, axisEta, axisPt}); histos.add("incl/pion/QA/after/hPhi_Eta_Pt_corrected", "", kTH3D, {axisPhi, axisEta, axisPt}); @@ -548,12 +578,12 @@ struct FlowSP { } if (cfg.cFillEventQA) { - histos.add("QA/hCentFull", " ; Centrality (%); ", {HistType::kTH1D, {axisCent}}); + histos.add("QA/hCentFull", " ; Centrality (%); ", {HistType::kTH1D, {axisCentralityOnePercent}}); } if (doprocessMCReco) { - registry.add("trackMCReco/after/incl/hIsPhysicalPrimary", "", {HistType::kTH3D, {axisCentrality, axisEta, axisPt}}); - registry.add("trackMCReco/after/incl/hIsNotPhysicalPrimary", "", {HistType::kTH3D, {axisCentrality, axisEta, axisPt}}); + registry.add("trackMCReco/after/incl/hIsPhysicalPrimary", "", {HistType::kTH3D, {axisCentralityFivePercent, axisEta, axisPt}}); + registry.add("trackMCReco/after/incl/hIsNotPhysicalPrimary", "", {HistType::kTH3D, {axisCentralityFivePercent, axisEta, axisPt}}); registry.add("trackMCReco/incl/hPtMCPtTrack", "", {HistType::kTH2D, {axisPt, axisPt}}); registry.add("trackMCReco/incl/hEtaMCEtaTrack", "", {HistType::kTH2D, {axisEta, axisEta}}); registry.add("trackMCReco/incl/hPtPerTrackSelection", "", {HistType::kTH2D, {axisPt, {nTrackSelections, 0, nTrackSelections}}}); @@ -568,12 +598,12 @@ struct FlowSP { registry.get(HIST("trackMCReco/incl/hPtPerTrackSelection"))->GetYaxis()->SetBinLabel(trackSel_ZeroCharge + 1, "Only charged"); registry.get(HIST("trackMCReco/incl/hPtPerTrackSelection"))->GetYaxis()->SetBinLabel(trackSel_ParticleWeights + 1, "Apply weights"); - registry.add("trackMCReco/hTrackSize_unFiltered", "", {HistType::kTH2D, {{100, 0, 4000}, axisCentrality}}); - registry.add("trackMCReco/hTrackSize_Filtered", "", {HistType::kTH2D, {{100, 0, 4000}, axisCentrality}}); - registry.add("trackMCReco/after/incl/hPt_hadron", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}}); - registry.add("trackMCReco/after/incl/hPt_proton", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}}); - registry.add("trackMCReco/after/incl/hPt_pion", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}}); - registry.add("trackMCReco/after/incl/hPt_kaon", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}}); + registry.add("trackMCReco/hTrackSize_unFiltered", "", {HistType::kTH2D, {{100, 0, 4000}, axisCentralityFivePercent}}); + registry.add("trackMCReco/hTrackSize_Filtered", "", {HistType::kTH2D, {{100, 0, 4000}, axisCentralityFivePercent}}); + registry.add("trackMCReco/after/incl/hPt_hadron", "", {HistType::kTH3D, {axisPt, axisEta, cfg.cAxisCentMC}}); + registry.add("trackMCReco/after/incl/hPt_proton", "", {HistType::kTH3D, {axisPt, axisEta, cfg.cAxisCentMC}}); + registry.add("trackMCReco/after/incl/hPt_pion", "", {HistType::kTH3D, {axisPt, axisEta, cfg.cAxisCentMC}}); + registry.add("trackMCReco/after/incl/hPt_kaon", "", {HistType::kTH3D, {axisPt, axisEta, cfg.cAxisCentMC}}); // Clone into particles and before/after registry.addClone("trackMCReco/after/incl/", "trackMCReco/after/pos/"); registry.addClone("trackMCReco/after/incl/", "trackMCReco/after/neg/"); @@ -583,76 +613,76 @@ struct FlowSP { } if (doprocessData) { - registry.add("QQCorrelations/qAqCX", "", kTProfile, {axisCent}); - registry.add("QQCorrelations/qAqCY", "", kTProfile, {axisCent}); - registry.add("QQCorrelations/qAqCXY", "", kTProfile, {axisCent}); - registry.add("QQCorrelations/qAXqCY", "", kTProfile, {axisCent}); - registry.add("QQCorrelations/qAYqCX", "", kTProfile, {axisCent}); - registry.add("QQCorrelations/qAXYqCXY", "", kTProfile, {axisCent}); + registry.add("QQCorrelations/qAqCX", "", kTProfile, {axisCentralityOnePercent}); + registry.add("QQCorrelations/qAqCY", "", kTProfile, {axisCentralityOnePercent}); + registry.add("QQCorrelations/qAqCXY", "", kTProfile, {axisCentralityOnePercent}); + registry.add("QQCorrelations/qAXqCY", "", kTProfile, {axisCentralityOnePercent}); + registry.add("QQCorrelations/qAYqCX", "", kTProfile, {axisCentralityOnePercent}); + registry.add("QQCorrelations/qAXYqCXY", "", kTProfile, {axisCentralityOnePercent}); registry.add("shift/ShiftZDCC", "ShiftZDCC", kTProfile3D, {{100, 0, 100}, {2, 0, 2}, {10, 0, 10}}); registry.add("shift/ShiftZDCA", "ShiftZDCA", kTProfile3D, {{100, 0, 100}, {2, 0, 2}, {10, 0, 10}}); if (cfg.cFillGeneralV1Histos) { // track properties per centrality and per eta, pt bin - registry.add("incl/vnCodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnAodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnC", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnA", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnCSetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnASetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnOdd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnEven", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); + registry.add("incl/vnCodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnAodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnC", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnA", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnCSetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnASetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnOdd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnEven", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); } if (cfg.cFillMeanPT) { - registry.add("incl/meanPT/ptV1A3D", "", kTProfile3D, {axisPt, axisEtaVn, axisCent}); - registry.add("incl/meanPT/ptV1C3D", "", kTProfile3D, {axisPt, axisEtaVn, axisCent}); + registry.add("incl/meanPT/ptV1A3D", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/meanPT/ptV1C3D", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); if (cfg.cFillMeanPTextra) { - registry.add("incl/meanPT/meanRelPtA", "", kTProfile2D, {axisEtaVn, axisCentrality}); - registry.add("incl/meanPT/meanRelPtC", "", kTProfile2D, {axisEtaVn, axisCentrality}); + registry.add("incl/meanPT/meanRelPtA", "", kTProfile2D, {axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/meanPT/meanRelPtC", "", kTProfile2D, {axisEtaVn, axisCentralityFivePercent}); - registry.add("incl/meanPT/hMeanPtEtaCent", "", kTProfile2D, {axisEtaVn, axisCent}); - registry.add("incl/meanPT/ptV1A", "", kTProfile2D, {axisEtaVn, axisCent}); - registry.add("incl/meanPT/ptV1C", "", kTProfile2D, {axisEtaVn, axisCent}); - registry.add("incl/meanPT/ptV1Aodd", "", kTProfile2D, {axisEtaVn, axisCent}); - registry.add("incl/meanPT/ptV1Codd", "", kTProfile2D, {axisEtaVn, axisCent}); - registry.add("incl/meanPT/hMeanPtCent", "", kTProfile, {axisCent}); + registry.add("incl/meanPT/hMeanPtEtaCent", "", kTProfile2D, {cfg.cAxisEtaMeanPt, axisCentralityOnePercent}); + registry.add("incl/meanPT/ptV1A", "", kTProfile2D, {axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/meanPT/ptV1C", "", kTProfile2D, {axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/meanPT/ptV1Aodd", "", kTProfile2D, {axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/meanPT/ptV1Codd", "", kTProfile2D, {axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/meanPT/hMeanPtCent", "", kTProfile, {axisCentralityOnePercent}); - registry.add("incl/meanPT/ptV1A3Dx", "", kTProfile3D, {axisPt, axisEtaVn, axisCent}); - registry.add("incl/meanPT/ptV1C3Dx", "", kTProfile3D, {axisPt, axisEtaVn, axisCent}); + registry.add("incl/meanPT/ptV1A3Dx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/meanPT/ptV1C3Dx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); - registry.add("incl/meanPT/ptV1A3Dy", "", kTProfile3D, {axisPt, axisEtaVn, axisCent}); - registry.add("incl/meanPT/ptV1C3Dy", "", kTProfile3D, {axisPt, axisEtaVn, axisCent}); + registry.add("incl/meanPT/ptV1A3Dy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/meanPT/ptV1C3Dy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); - registry.add("incl/meanPT/meanPxA", "", kTH3D, {axisCent, axisPhiPlane, axisPx}); - registry.add("incl/meanPT/meanPxC", "", kTH3D, {axisCent, axisPhiPlane, axisPx}); + registry.add("incl/meanPT/meanPxA", "", kTH3D, {axisCentralityFivePercent, axisPhiPlane, axisPx}); + registry.add("incl/meanPT/meanPxC", "", kTH3D, {axisCentralityFivePercent, axisPhiPlane, axisPx}); } } if (cfg.cFillXandYterms) { - registry.add("incl/vnAx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnAy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnCx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnCy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); + registry.add("incl/vnAx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnAy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnCx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnCy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); } if (cfg.cFillMixedHarmonics) { - registry.add("incl/MH/vnAxCxUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/MH/vnAyCyUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/MH/vnAxCyUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/MH/vnAyCxUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); + registry.add("incl/MH/vnAxCxUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/MH/vnAyCyUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/MH/vnAxCyUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/MH/vnAyCxUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); } if (cfg.cFillEventPlane) { - registry.add("incl/vnA_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnC_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnFull_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); + registry.add("incl/vnA_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnC_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnFull_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); } if (cfg.cFillEventPlaneQA) { histos.add("QA/hSPplaneAC", "hSPplaneAC", kTH2D, {axisPhiPlane, axisPhiPlane}); histos.add("QA/hSPplaneFull", "hSPplaneFull", kTH1D, {axisPhiPlane}); - histos.add("QA/hCosPhiACosPhiC", "hCosPhiACosPhiC; Centrality(%); #LT Cos(#Psi^{A})Cos(#Psi^{C})#GT", kTProfile, {axisCent}); - histos.add("QA/hSinPhiASinPhiC", "hSinPhiASinPhiC; Centrality(%); #LT Sin(#Psi^{A})Sin(#Psi^{C})#GT", kTProfile, {axisCent}); - histos.add("QA/hSinPhiACosPhiC", "hSinPhiACosPhiC; Centrality(%); #LT Sin(#Psi^{A})Cos(#Psi^{C})#GT", kTProfile, {axisCent}); - histos.add("QA/hCosPhiASinsPhiC", "hCosPhiASinsPhiC; Centrality(%); #LT Cos(#Psi^{A})Sin(#Psi^{C})#GT", kTProfile, {axisCent}); - histos.add("QA/hFullEvPlaneRes", "hFullEvPlaneRes; Centrality(%); -#LT Cos(#Psi^{A} - #Psi^{C})#GT ", kTProfile, {axisCent}); + histos.add("QA/hCosPhiACosPhiC", "hCosPhiACosPhiC; Centrality(%); #LT Cos(#Psi^{A})Cos(#Psi^{C})#GT", kTProfile, {axisCentralityOnePercent}); + histos.add("QA/hSinPhiASinPhiC", "hSinPhiASinPhiC; Centrality(%); #LT Sin(#Psi^{A})Sin(#Psi^{C})#GT", kTProfile, {axisCentralityOnePercent}); + histos.add("QA/hSinPhiACosPhiC", "hSinPhiACosPhiC; Centrality(%); #LT Sin(#Psi^{A})Cos(#Psi^{C})#GT", kTProfile, {axisCentralityOnePercent}); + histos.add("QA/hCosPhiASinsPhiC", "hCosPhiASinsPhiC; Centrality(%); #LT Cos(#Psi^{A})Sin(#Psi^{C})#GT", kTProfile, {axisCentralityOnePercent}); + histos.add("QA/hFullEvPlaneRes", "hFullEvPlaneRes; Centrality(%); -#LT Cos(#Psi^{A} - #Psi^{C})#GT ", kTProfile, {axisCentralityOnePercent}); } } // end of doProcessData @@ -668,30 +698,30 @@ struct FlowSP { if (doprocessDataPID) { if (cfg.cFillGeneralV1Histos) { - registry.add("incl/pion/vnCodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/vnAodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/vnC", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/vnA", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnCSetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/vnASetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); + registry.add("incl/pion/vnCodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/vnAodd", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/vnC", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/vnA", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnCSetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/vnASetPlane", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); } if (cfg.cFillEventPlane) { - registry.add("incl/pion/vnA_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/vnC_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/vnFull_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); + registry.add("incl/pion/vnA_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/vnC_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/vnFull_EP", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); } if (cfg.cFillXandYterms) { - registry.add("incl/pion/vnAx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/vnAy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/vnCx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/vnCy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); + registry.add("incl/pion/vnAx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/vnAy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/vnCx", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/vnCy", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); } if (cfg.cFillMixedHarmonics) { - registry.add("incl/pion/MH/vnAxCxUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/MH/vnAyCyUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/MH/vnAxCyUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); - registry.add("incl/pion/MH/vnAyCxUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentrality}); + registry.add("incl/pion/MH/vnAxCxUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/MH/vnAyCyUx_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/MH/vnAxCyUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); + registry.add("incl/pion/MH/vnAyCxUy_MH", "", kTProfile3D, {axisPt, axisEtaVn, axisCentralityFivePercent}); } registry.addClone("incl/pion/", "incl/proton/"); registry.addClone("incl/pion/", "incl/kaon/"); @@ -703,10 +733,10 @@ struct FlowSP { } if (doprocessMCGen || doprocessMCReco) { registry.add("trackMCGen/nCollReconstructedPerMcCollision", "", {HistType::kTH1D, {{10, -5, 5}}}); - registry.add("trackMCGen/after/incl/hPt_hadron", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}}); - registry.add("trackMCGen/after/incl/hPt_proton", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}}); - registry.add("trackMCGen/after/incl/hPt_pion", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}}); - registry.add("trackMCGen/after/incl/hPt_kaon", "", {HistType::kTH3D, {axisPt, axisEta, axisCentrality}}); + registry.add("trackMCGen/after/incl/hPt_hadron", "", {HistType::kTH3D, {axisPt, axisEta, axisCentralityOnePercent}}); + registry.add("trackMCGen/after/incl/hPt_proton", "", {HistType::kTH3D, {axisPt, axisEta, axisCentralityOnePercent}}); + registry.add("trackMCGen/after/incl/hPt_pion", "", {HistType::kTH3D, {axisPt, axisEta, axisCentralityOnePercent}}); + registry.add("trackMCGen/after/incl/hPt_kaon", "", {HistType::kTH3D, {axisPt, axisEta, axisCentralityOnePercent}}); registry.add("trackMCGen/after/incl/phi_eta_vtxZ_gen", "", {HistType::kTH3D, {axisPhi, axisEta, axisVz}}); registry.addClone("trackMCGen/after/incl/", "trackMCGen/after/pos/"); @@ -1000,6 +1030,7 @@ struct FlowSP { return true; } + template inline void fillPrimaryHistos(const McParticleObject& mcparticle) { @@ -1011,80 +1042,144 @@ struct FlowSP { } } + //HIER + template + void makeSelectionMatrix(std::vector passedCuts) { + int nCuts = static_cast(passedCuts.size()); + + int nRejected = 0; + int rejectedIndex = -1; + + for(int i = 0; i < nCuts; i++){ + if(passedCuts[i]) { + continue; + } + + nRejected++; + rejectedIndex = i; + + // Loop over entire matrix again for this specific cut that failed + for(int j = 0; j < nCuts; j++){ + if(!passedCuts[j]) { + histos.fill(HIST("h") + HIST(Selections[st]) + HIST("RejectionMatrix"), i, j); + } + } + } + + // Check if only one single selection rejected event or track + if(nRejected == 1){ + histos.fill(HIST("hSingle") + HIST(Selections[st]) + HIST("Rejection"), rejectedIndex); + } + } + template bool eventSelected(const TCollision& collision, const int& multTrk) { + + bool isEventSelected = true; + std::vector passedCuts(nEventSelections, true); + if (!collision.sel8()) { - return 0; + isEventSelected = false; + passedCuts[evSel_sel8] = false; + } + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_sel8); } - histos.fill(HIST("hEventCount"), evSel_sel8); if (cfg.cEvtUseRCTFlagChecker && !rctChecker(collision)) { - return 0; + isEventSelected = false; + passedCuts[evSel_RCTFlagsZDC] = false; + } + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_RCTFlagsZDC); } - histos.fill(HIST("hEventCount"), evSel_RCTFlagsZDC); // Occupancy if (cfg.cEvSelsDoOccupancySel) { auto occupancy = collision.trackOccupancyInTimeRange(); if (occupancy > cfg.cEvSelsMaxOccupancy || occupancy < cfg.cEvSelsMinOccupancy) { - return 0; + isEventSelected = false; + passedCuts[evSel_occupancy] = false; } } - histos.fill(HIST("hEventCount"), evSel_occupancy); + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_occupancy); + } if (cfg.cEvSelsNoSameBunchPileupCut) { if (!collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) { // rejects collisions which are associated with the same "found-by-T0" bunch crossing // https://indico.cern.ch/event/1396220/#1-event-selection-with-its-rof - return 0; + isEventSelected = false; + passedCuts[evSel_kNoSameBunchPileup] = false; } } - histos.fill(HIST("hEventCount"), evSel_kNoSameBunchPileup); + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_kNoSameBunchPileup); + } if (cfg.cEvSelsIsGoodZvtxFT0vsPV) { if (!collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) { // removes collisions with large differences between z of PV by tracks and z of PV from FT0 A-C time difference // use this cut at low multiplicities with caution - return 0; + isEventSelected = false; + passedCuts[evSel_kIsGoodZvtxFT0vsPV] = false; } } - histos.fill(HIST("hEventCount"), evSel_kIsGoodZvtxFT0vsPV); + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_kIsGoodZvtxFT0vsPV); + } if (cfg.cEvSelsNoCollInTimeRangeStandard) { if (!collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard)) { // Rejection of the collisions which have other events nearby - return 0; + isEventSelected = false; + passedCuts[evSel_kNoCollInTimeRangeStandard] = false; } } - histos.fill(HIST("hEventCount"), evSel_kNoCollInTimeRangeStandard); + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_kNoCollInTimeRangeStandard); + } if (cfg.cEvSelsNoCollInTimeRangeNarrow) { if (!collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeNarrow)) { // Rejection of the collisions which have other events nearby - return 0; + isEventSelected = false; + passedCuts[evSel_kNoCollInTimeRangeNarrow] = false; } } - histos.fill(HIST("hEventCount"), evSel_kNoCollInTimeRangeNarrow); + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_kNoCollInTimeRangeNarrow); + } if (cfg.cEvSelsIsVertexITSTPC) { if (!collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC)) { // selects collisions with at least one ITS-TPC track, and thus rejects vertices built from ITS-only tracks - return 0; + isEventSelected = false; + passedCuts[evSel_kIsVertexITSTPC] = false; } } - histos.fill(HIST("hEventCount"), evSel_kIsVertexITSTPC); + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_kIsVertexITSTPC); + } if (cfg.cEvSelsIsGoodITSLayersAll) { if (!collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll)) { // New event selection bits to cut time intervals with dead ITS staves // https://indico.cern.ch/event/1493023/ (09-01-2025) - return 0; + isEventSelected = false; + passedCuts[evSel_kIsGoodITSLayersAll] = false; } } - histos.fill(HIST("hEventCount"), evSel_kIsGoodITSLayersAll); + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_kIsGoodITSLayersAll); + } if (cfg.cEvSelsIsGoodITSLayer0123) { if (!collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer0123)) { - return 0; + isEventSelected = false; + passedCuts[evSel_kIsGoodITSLayer0123] = false; } } - histos.fill(HIST("hEventCount"), evSel_kIsGoodITSLayer0123); + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_kIsGoodITSLayer0123); + } if (cfg.cEvSelsUseAdditionalEventCut) { float vtxz = -999; @@ -1100,30 +1195,45 @@ struct FlowSP { auto multNTracksPV = collision.multNTracksPV(); - if (vtxz > cfg.cEvSelsVtxZ || vtxz < -cfg.cEvSelsVtxZ) { - return 0; - } - if (multNTracksPV < fMultPVCutLow->Eval(collision.centFT0C())) { - return 0; + if (vtxz > cfg.cEvSelsVtxZ || vtxz < -cfg.cEvSelsVtxZ || multNTracksPV < fMultPVCutLow->Eval(collision.centFT0C()) || multNTracksPV > fMultPVCutHigh->Eval(collision.centFT0C()) || multTrk < fMultCutLow->Eval(collision.centFT0C()) || multTrk > fMultCutHigh->Eval(collision.centFT0C())) { + isEventSelected = false; + passedCuts[evSel_MultCuts] = false; } - if (multNTracksPV > fMultPVCutHigh->Eval(collision.centFT0C())) { - return 0; - } - if (multTrk < fMultCutLow->Eval(collision.centFT0C())) { - return 0; + } + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_MultCuts); + } + + if constexpr (o2::framework::has_type_v) { + if (!collision.isSelected()) { + isEventSelected = false; + passedCuts[evSel_isSelectedZDC] = false; } - if (multTrk > fMultCutHigh->Eval(collision.centFT0C())) { - return 0; + if(isEventSelected) { + histos.fill(HIST("hEventCount"), evSel_isSelectedZDC); } } - histos.fill(HIST("hEventCount"), evSel_MultCuts); - return 1; + if (spm.centrality > cfg.cCentMax || spm.centrality < cfg.cCentMin) { + isEventSelected = false; + passedCuts[evSel_CentCuts] = false; + } + histos.fill(HIST("hEventCount"), evSel_CentCuts); + + + makeSelectionMatrix(passedCuts); + + return isEventSelected; } template bool trackSelected(const TrackObject& track, const int& field) { + + bool isTrackSelected = true; + std::vector passedCuts(nTrackSelections, true); + + //---- This is a lambda!! auto fillSpectraStudyMCReco = [&](TrackSelections sel) { if constexpr (o2::framework::has_type_v) { if (!track.has_mcParticle()) { @@ -1140,25 +1250,35 @@ struct FlowSP { } } }; + //---- End of lambda if (std::fabs(track.eta()) > cfg.cTrackSelsEta) { - return false; + isTrackSelected = false; + passedCuts[trackSel_Eta] = false; } - histos.fill(HIST("hTrackCount"), trackSel_Eta); - fillSpectraStudyMCReco(trackSel_Eta); - + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_Eta); + fillSpectraStudyMCReco(trackSel_Eta); + } + if (track.pt() < cfg.cTrackSelsPtmin || track.pt() > cfg.cTrackSelsPtmax) { - return false; + isTrackSelected = false; + passedCuts[trackSel_Pt] = false; } - histos.fill(HIST("hTrackCount"), trackSel_Pt); - fillSpectraStudyMCReco(trackSel_Pt); - + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_Pt); + fillSpectraStudyMCReco(trackSel_Pt); + } + if (track.tpcNClsCrossedRows() < cfg.cTrackSelsNcls) { - return false; + isTrackSelected = false; + passedCuts[trackSel_NCls] = false; } - histos.fill(HIST("hTrackCount"), trackSel_NCls); - fillSpectraStudyMCReco(trackSel_NCls); - + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_NCls); + fillSpectraStudyMCReco(trackSel_NCls); + } + double phimodn = track.phi(); if (field < 0) { phimodn = o2::constants::math::TwoPI - phimodn; @@ -1178,69 +1298,109 @@ struct FlowSP { if (cfg.cTrackSelsUseAdditionalTrackCut) { if (phimodn < fPhiCutHigh->Eval(track.pt()) && phimodn > fPhiCutLow->Eval(track.pt())) { - return false; // reject track + isTrackSelected = false; + passedCuts[trackSel_TPCBoundary] = false; // reject track } } - if (cfg.cFillTrackQA) { - histos.fill(HIST("incl/QA/after/pt_phi"), track.pt(), phimodn); + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_TPCBoundary); + fillSpectraStudyMCReco(trackSel_TPCBoundary); + if (cfg.cFillTrackQA) { + histos.fill(HIST("incl/QA/after/pt_phi"), track.pt(), phimodn); + } } - histos.fill(HIST("hTrackCount"), trackSel_TPCBoundary); - fillSpectraStudyMCReco(trackSel_TPCBoundary); + if (track.tpcFractionSharedCls() > cfg.cTrackSelsFshcls) { + isTrackSelected = false; + passedCuts[trackSel_FshCls] = false; + } + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_FshCls); + fillSpectraStudyMCReco(trackSel_FshCls); + } + // Only fill primary/secondary histos for MC data. if constexpr (o2::framework::has_type_v) { + if (!track.has_mcParticle()) { + return false; + } auto mcParticle = track.template mcParticle_as(); - fillPrimaryHistos(mcParticle); - if (spm.charge == kPositive) { - fillPrimaryHistos(mcParticle); - } else { - fillPrimaryHistos(mcParticle); + if(isTrackSelected){ + fillPrimaryHistos(mcParticle); + if (spm.charge == kPositive) { + fillPrimaryHistos(mcParticle); + } else { + fillPrimaryHistos(mcParticle); + } } if (std::fabs(track.dcaXY()) > cfg.cTrackSelsDCAxy || std::fabs(track.dcaXY()) > fDCACut->Eval(track.pt())) { - return false; + isTrackSelected = false; + passedCuts[trackSel_DCAxy] = false; } - histos.fill(HIST("hTrackCount"), trackSel_DCAxy); - fillSpectraStudyMCReco(trackSel_DCAxy); - + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_DCAxy); + fillSpectraStudyMCReco(trackSel_DCAxy); + } + if (std::fabs(track.dcaZ()) > cfg.cTrackSelsDCAz || (cfg.cTrackSelsDoDCApt && std::fabs(track.dcaZ()) > fDCACut->Eval(track.pt()))) { - return false; + isTrackSelected = false; + passedCuts[trackSel_DCAz] = false; + } + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_DCAz); + fillSpectraStudyMCReco(trackSel_DCAz); } - histos.fill(HIST("hTrackCount"), trackSel_DCAz); - fillSpectraStudyMCReco(trackSel_DCAz); + if (!track.isGlobalTrack()) { + isTrackSelected = false; + passedCuts[trackSel_GlobalTracks] = false; + } + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_GlobalTracks); + fillSpectraStudyMCReco(trackSel_GlobalTracks); + } + + if(isTrackSelected) { fillPrimaryHistos(mcParticle); if (spm.charge == kPositive) { fillPrimaryHistos(mcParticle); } else { fillPrimaryHistos(mcParticle); } - } else { // Only apply DCA-cuts for data + } + } else { // Only apply DCA-cuts for data (Do not fill secondary plots in between in data as we don't have that info) if (std::fabs(track.dcaXY()) > cfg.cTrackSelsDCAxy || std::fabs(track.dcaXY()) > fDCACut->Eval(track.pt())) { - return false; + isTrackSelected = false; + passedCuts[trackSel_DCAxy] = false; + } + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_DCAxy); } - histos.fill(HIST("hTrackCount"), trackSel_DCAxy); if (std::fabs(track.dcaZ()) > cfg.cTrackSelsDCAz || (cfg.cTrackSelsDoDCApt && std::fabs(track.dcaZ()) > fDCACut->Eval(track.pt()))) { - return false; + isTrackSelected = false; + passedCuts[trackSel_DCAz] = false; + } + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_DCAz); + fillSpectraStudyMCReco(trackSel_DCAz); } - histos.fill(HIST("hTrackCount"), trackSel_DCAz); - } - - if (track.tpcFractionSharedCls() > cfg.cTrackSelsFshcls) { - return false; - } - histos.fill(HIST("hTrackCount"), trackSel_FshCls); - fillSpectraStudyMCReco(trackSel_FshCls); - if (!track.isGlobalTrack()) { - return false; + if (!track.isGlobalTrack()) { + isTrackSelected = false; + passedCuts[trackSel_GlobalTracks] = false; + } + if(isTrackSelected) { + histos.fill(HIST("hTrackCount"), trackSel_GlobalTracks); + fillSpectraStudyMCReco(trackSel_GlobalTracks); + } } - histos.fill(HIST("hTrackCount"), trackSel_GlobalTracks); - fillSpectraStudyMCReco(trackSel_GlobalTracks); - return true; + makeSelectionMatrix(passedCuts); + + return isTrackSelected; } template @@ -1312,8 +1472,8 @@ struct FlowSP { registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnEven"), track.pt(), track.eta(), spm.centrality, 0.5 * ((uqA) + (uqC)) * invSqrtQQ, weight); registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnA"), track.pt(), track.eta(), spm.centrality, (uqA)*invSqrtQQ, weight); registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnC"), track.pt(), track.eta(), spm.centrality, (uqC)*invSqrtQQ, weight); - registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnCSetPlane"), track.pt(), track.eta(), spm.centrality, (spm.uy + spm.ux) * invSqrtQQ, weight); - registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnASetPlane"), track.pt(), track.eta(), spm.centrality, (minusQ * spm.ux - spm.uy) * invSqrtQQ, weight); + registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnCSetPlane"), track.pt(), track.eta(), spm.centrality, (spm.uy + spm.ux), weight); + registry.fill(HIST(Charge[ct]) + HIST(Species[pt]) + HIST("vnASetPlane"), track.pt(), track.eta(), spm.centrality, (minusQ * spm.ux - spm.uy), weight); } if (cfg.cFillMixedHarmonics) { @@ -1504,12 +1664,6 @@ struct FlowSP { if (!eventSelected(collision, tracks.size())) { return; } - - if (!collision.isSelected()) { // selected by ZDCQVectors task (checks signal in ZDC) --> only possible in data not MC - return; - } - histos.fill(HIST("hEventCount"), evSel_isSelectedZDC); - // Always fill centrality histogram after event selections! histos.fill(HIST("hCentrality"), spm.centrality); @@ -1556,12 +1710,6 @@ struct FlowSP { histos.fill(HIST("QA/hFullEvPlaneRes"), spm.centrality, -1 * std::cos(spm.psiA - spm.psiC)); } - if (spm.centrality > cfg.cCentMax || spm.centrality < cfg.cCentMin) { - return; - } - - histos.fill(HIST("hEventCount"), evSel_CentCuts); - // Load correlations and SP resolution needed for Scalar Product and event plane methods. // Only load once! // If not loaded set to 1 @@ -2056,6 +2204,8 @@ struct FlowSP { spm.centrality = collision.centNGlobal(); } + histos.fill(HIST("hCentrality"), spm.centrality); + if (cfg.cFillQABefore) { fillEventQA(collision, filteredTracks); } @@ -2064,12 +2214,6 @@ struct FlowSP { return; } - if (spm.centrality > cfg.cCentMax || spm.centrality < cfg.cCentMin) { - return; - } - - histos.fill(HIST("hEventCount"), evSel_CentCuts); - if (!collision.has_mcCollision()) { return; } From 025ee93e127495a09b2a58f9f6a4e2a1b32af176 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Fri, 20 Nov 2026 13:36:37 +0000 Subject: [PATCH 2/4] Please consider the following formatting changes --- PWGCF/Flow/Tasks/flowSP.cxx | 215 ++++++++++++++++++------------------ 1 file changed, 107 insertions(+), 108 deletions(-) diff --git a/PWGCF/Flow/Tasks/flowSP.cxx b/PWGCF/Flow/Tasks/flowSP.cxx index 1e6347762dd..539b7187530 100644 --- a/PWGCF/Flow/Tasks/flowSP.cxx +++ b/PWGCF/Flow/Tasks/flowSP.cxx @@ -355,9 +355,9 @@ struct FlowSP { nParticleTypes }; - enum SelectionType { - kEvent, - kTrack, + enum SelectionType { + kEvent, + kTrack, nSelectionTypes }; @@ -424,8 +424,8 @@ struct FlowSP { histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_MultCuts + 1, "Multiplicity Cuts Pilup"); histos.get(HIST("hEventCount"))->GetXaxis()->SetBinLabel(evSel_isSelectedZDC + 1, "isSelected"); - histos.add("hSingleEventRejection", "", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}}); - histos.add("hEventRejectionMatrix", "", {HistType::kTH2D, {{nEventSelections, 0, nEventSelections}, {nEventSelections, 0, nEventSelections}}}); + histos.add("hSingleEventRejection", "", {HistType::kTH1D, {{nEventSelections, 0, nEventSelections}}}); + histos.add("hEventRejectionMatrix", "", {HistType::kTH2D, {{nEventSelections, 0, nEventSelections}, {nEventSelections, 0, nEventSelections}}}); for (int i = 1; i <= nEventSelections; i++) { const char* label = histos.get(HIST("hEventCount"))->GetXaxis()->GetBinLabel(i); @@ -446,8 +446,8 @@ struct FlowSP { histos.get(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_ZeroCharge + 1, "Only charged"); histos.get(HIST("hTrackCount"))->GetXaxis()->SetBinLabel(trackSel_ParticleWeights + 1, "Apply weights"); - histos.add("hSingleTrackRejection", "", {HistType::kTH1D, {{nTrackSelections, 0, nTrackSelections}}}); - histos.add("hTrackRejectionMatrix", "", {HistType::kTH2D, {{nTrackSelections, 0, nTrackSelections}, {nTrackSelections, 0, nTrackSelections}}}); + histos.add("hSingleTrackRejection", "", {HistType::kTH1D, {{nTrackSelections, 0, nTrackSelections}}}); + histos.add("hTrackRejectionMatrix", "", {HistType::kTH2D, {{nTrackSelections, 0, nTrackSelections}, {nTrackSelections, 0, nTrackSelections}}}); for (int i = 1; i <= nTrackSelections; i++) { const char* label = histos.get(HIST("hTrackCount"))->GetXaxis()->GetBinLabel(i); @@ -1030,7 +1030,6 @@ struct FlowSP { return true; } - template inline void fillPrimaryHistos(const McParticleObject& mcparticle) { @@ -1042,33 +1041,34 @@ struct FlowSP { } } - //HIER - template - void makeSelectionMatrix(std::vector passedCuts) { + // HIER + template + void makeSelectionMatrix(std::vector passedCuts) + { int nCuts = static_cast(passedCuts.size()); - int nRejected = 0; - int rejectedIndex = -1; + int nRejected = 0; + int rejectedIndex = -1; - for(int i = 0; i < nCuts; i++){ - if(passedCuts[i]) { - continue; + for (int i = 0; i < nCuts; i++) { + if (passedCuts[i]) { + continue; } - nRejected++; - rejectedIndex = i; + nRejected++; + rejectedIndex = i; - // Loop over entire matrix again for this specific cut that failed - for(int j = 0; j < nCuts; j++){ - if(!passedCuts[j]) { + // Loop over entire matrix again for this specific cut that failed + for (int j = 0; j < nCuts; j++) { + if (!passedCuts[j]) { histos.fill(HIST("h") + HIST(Selections[st]) + HIST("RejectionMatrix"), i, j); } } } - // Check if only one single selection rejected event or track - if(nRejected == 1){ - histos.fill(HIST("hSingle") + HIST(Selections[st]) + HIST("Rejection"), rejectedIndex); + // Check if only one single selection rejected event or track + if (nRejected == 1) { + histos.fill(HIST("hSingle") + HIST(Selections[st]) + HIST("Rejection"), rejectedIndex); } } @@ -1076,22 +1076,22 @@ struct FlowSP { bool eventSelected(const TCollision& collision, const int& multTrk) { - bool isEventSelected = true; - std::vector passedCuts(nEventSelections, true); + bool isEventSelected = true; + std::vector passedCuts(nEventSelections, true); if (!collision.sel8()) { - isEventSelected = false; - passedCuts[evSel_sel8] = false; + isEventSelected = false; + passedCuts[evSel_sel8] = false; } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_sel8); } if (cfg.cEvtUseRCTFlagChecker && !rctChecker(collision)) { - isEventSelected = false; - passedCuts[evSel_RCTFlagsZDC] = false; + isEventSelected = false; + passedCuts[evSel_RCTFlagsZDC] = false; } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_RCTFlagsZDC); } @@ -1099,11 +1099,11 @@ struct FlowSP { if (cfg.cEvSelsDoOccupancySel) { auto occupancy = collision.trackOccupancyInTimeRange(); if (occupancy > cfg.cEvSelsMaxOccupancy || occupancy < cfg.cEvSelsMinOccupancy) { - isEventSelected = false; - passedCuts[evSel_occupancy] = false; + isEventSelected = false; + passedCuts[evSel_occupancy] = false; } } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_occupancy); } @@ -1111,52 +1111,52 @@ struct FlowSP { if (!collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup)) { // rejects collisions which are associated with the same "found-by-T0" bunch crossing // https://indico.cern.ch/event/1396220/#1-event-selection-with-its-rof - isEventSelected = false; - passedCuts[evSel_kNoSameBunchPileup] = false; + isEventSelected = false; + passedCuts[evSel_kNoSameBunchPileup] = false; } } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_kNoSameBunchPileup); } if (cfg.cEvSelsIsGoodZvtxFT0vsPV) { if (!collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV)) { // removes collisions with large differences between z of PV by tracks and z of PV from FT0 A-C time difference // use this cut at low multiplicities with caution - isEventSelected = false; - passedCuts[evSel_kIsGoodZvtxFT0vsPV] = false; + isEventSelected = false; + passedCuts[evSel_kIsGoodZvtxFT0vsPV] = false; } } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_kIsGoodZvtxFT0vsPV); } if (cfg.cEvSelsNoCollInTimeRangeStandard) { if (!collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard)) { // Rejection of the collisions which have other events nearby - isEventSelected = false; - passedCuts[evSel_kNoCollInTimeRangeStandard] = false; + isEventSelected = false; + passedCuts[evSel_kNoCollInTimeRangeStandard] = false; } } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_kNoCollInTimeRangeStandard); } if (cfg.cEvSelsNoCollInTimeRangeNarrow) { if (!collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeNarrow)) { // Rejection of the collisions which have other events nearby - isEventSelected = false; - passedCuts[evSel_kNoCollInTimeRangeNarrow] = false; + isEventSelected = false; + passedCuts[evSel_kNoCollInTimeRangeNarrow] = false; } } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_kNoCollInTimeRangeNarrow); } if (cfg.cEvSelsIsVertexITSTPC) { if (!collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC)) { // selects collisions with at least one ITS-TPC track, and thus rejects vertices built from ITS-only tracks - isEventSelected = false; - passedCuts[evSel_kIsVertexITSTPC] = false; + isEventSelected = false; + passedCuts[evSel_kIsVertexITSTPC] = false; } } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_kIsVertexITSTPC); } @@ -1164,20 +1164,20 @@ struct FlowSP { if (!collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll)) { // New event selection bits to cut time intervals with dead ITS staves // https://indico.cern.ch/event/1493023/ (09-01-2025) - isEventSelected = false; - passedCuts[evSel_kIsGoodITSLayersAll] = false; + isEventSelected = false; + passedCuts[evSel_kIsGoodITSLayersAll] = false; } } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_kIsGoodITSLayersAll); } if (cfg.cEvSelsIsGoodITSLayer0123) { if (!collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer0123)) { - isEventSelected = false; - passedCuts[evSel_kIsGoodITSLayer0123] = false; + isEventSelected = false; + passedCuts[evSel_kIsGoodITSLayer0123] = false; } } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_kIsGoodITSLayer0123); } @@ -1196,31 +1196,30 @@ struct FlowSP { auto multNTracksPV = collision.multNTracksPV(); if (vtxz > cfg.cEvSelsVtxZ || vtxz < -cfg.cEvSelsVtxZ || multNTracksPV < fMultPVCutLow->Eval(collision.centFT0C()) || multNTracksPV > fMultPVCutHigh->Eval(collision.centFT0C()) || multTrk < fMultCutLow->Eval(collision.centFT0C()) || multTrk > fMultCutHigh->Eval(collision.centFT0C())) { - isEventSelected = false; - passedCuts[evSel_MultCuts] = false; + isEventSelected = false; + passedCuts[evSel_MultCuts] = false; } } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_MultCuts); } if constexpr (o2::framework::has_type_v) { - if (!collision.isSelected()) { - isEventSelected = false; - passedCuts[evSel_isSelectedZDC] = false; + if (!collision.isSelected()) { + isEventSelected = false; + passedCuts[evSel_isSelectedZDC] = false; } - if(isEventSelected) { + if (isEventSelected) { histos.fill(HIST("hEventCount"), evSel_isSelectedZDC); } } if (spm.centrality > cfg.cCentMax || spm.centrality < cfg.cCentMin) { - isEventSelected = false; + isEventSelected = false; passedCuts[evSel_CentCuts] = false; } histos.fill(HIST("hEventCount"), evSel_CentCuts); - makeSelectionMatrix(passedCuts); return isEventSelected; @@ -1230,8 +1229,8 @@ struct FlowSP { bool trackSelected(const TrackObject& track, const int& field) { - bool isTrackSelected = true; - std::vector passedCuts(nTrackSelections, true); + bool isTrackSelected = true; + std::vector passedCuts(nTrackSelections, true); //---- This is a lambda!! auto fillSpectraStudyMCReco = [&](TrackSelections sel) { @@ -1253,32 +1252,32 @@ struct FlowSP { //---- End of lambda if (std::fabs(track.eta()) > cfg.cTrackSelsEta) { - isTrackSelected = false; - passedCuts[trackSel_Eta] = false; + isTrackSelected = false; + passedCuts[trackSel_Eta] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_Eta); fillSpectraStudyMCReco(trackSel_Eta); } - + if (track.pt() < cfg.cTrackSelsPtmin || track.pt() > cfg.cTrackSelsPtmax) { - isTrackSelected = false; - passedCuts[trackSel_Pt] = false; + isTrackSelected = false; + passedCuts[trackSel_Pt] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_Pt); fillSpectraStudyMCReco(trackSel_Pt); } - + if (track.tpcNClsCrossedRows() < cfg.cTrackSelsNcls) { - isTrackSelected = false; + isTrackSelected = false; passedCuts[trackSel_NCls] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_NCls); fillSpectraStudyMCReco(trackSel_NCls); } - + double phimodn = track.phi(); if (field < 0) { phimodn = o2::constants::math::TwoPI - phimodn; @@ -1298,11 +1297,11 @@ struct FlowSP { if (cfg.cTrackSelsUseAdditionalTrackCut) { if (phimodn < fPhiCutHigh->Eval(track.pt()) && phimodn > fPhiCutLow->Eval(track.pt())) { - isTrackSelected = false; + isTrackSelected = false; passedCuts[trackSel_TPCBoundary] = false; // reject track } } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_TPCBoundary); fillSpectraStudyMCReco(trackSel_TPCBoundary); if (cfg.cFillTrackQA) { @@ -1311,22 +1310,22 @@ struct FlowSP { } if (track.tpcFractionSharedCls() > cfg.cTrackSelsFshcls) { - isTrackSelected = false; + isTrackSelected = false; passedCuts[trackSel_FshCls] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_FshCls); fillSpectraStudyMCReco(trackSel_FshCls); } - + // Only fill primary/secondary histos for MC data. if constexpr (o2::framework::has_type_v) { if (!track.has_mcParticle()) { - return false; - } + return false; + } auto mcParticle = track.template mcParticle_as(); - if(isTrackSelected){ + if (isTrackSelected) { fillPrimaryHistos(mcParticle); if (spm.charge == kPositive) { fillPrimaryHistos(mcParticle); @@ -1336,70 +1335,70 @@ struct FlowSP { } if (std::fabs(track.dcaXY()) > cfg.cTrackSelsDCAxy || std::fabs(track.dcaXY()) > fDCACut->Eval(track.pt())) { - isTrackSelected = false; + isTrackSelected = false; passedCuts[trackSel_DCAxy] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_DCAxy); fillSpectraStudyMCReco(trackSel_DCAxy); } - + if (std::fabs(track.dcaZ()) > cfg.cTrackSelsDCAz || (cfg.cTrackSelsDoDCApt && std::fabs(track.dcaZ()) > fDCACut->Eval(track.pt()))) { - isTrackSelected = false; + isTrackSelected = false; passedCuts[trackSel_DCAz] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_DCAz); fillSpectraStudyMCReco(trackSel_DCAz); } if (!track.isGlobalTrack()) { - isTrackSelected = false; + isTrackSelected = false; passedCuts[trackSel_GlobalTracks] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_GlobalTracks); fillSpectraStudyMCReco(trackSel_GlobalTracks); } - - if(isTrackSelected) { - fillPrimaryHistos(mcParticle); - if (spm.charge == kPositive) { - fillPrimaryHistos(mcParticle); - } else { - fillPrimaryHistos(mcParticle); + + if (isTrackSelected) { + fillPrimaryHistos(mcParticle); + if (spm.charge == kPositive) { + fillPrimaryHistos(mcParticle); + } else { + fillPrimaryHistos(mcParticle); + } } - } } else { // Only apply DCA-cuts for data (Do not fill secondary plots in between in data as we don't have that info) if (std::fabs(track.dcaXY()) > cfg.cTrackSelsDCAxy || std::fabs(track.dcaXY()) > fDCACut->Eval(track.pt())) { - isTrackSelected = false; + isTrackSelected = false; passedCuts[trackSel_DCAxy] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_DCAxy); } if (std::fabs(track.dcaZ()) > cfg.cTrackSelsDCAz || (cfg.cTrackSelsDoDCApt && std::fabs(track.dcaZ()) > fDCACut->Eval(track.pt()))) { - isTrackSelected = false; + isTrackSelected = false; passedCuts[trackSel_DCAz] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_DCAz); fillSpectraStudyMCReco(trackSel_DCAz); } if (!track.isGlobalTrack()) { - isTrackSelected = false; + isTrackSelected = false; passedCuts[trackSel_GlobalTracks] = false; } - if(isTrackSelected) { + if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_GlobalTracks); fillSpectraStudyMCReco(trackSel_GlobalTracks); } } makeSelectionMatrix(passedCuts); - + return isTrackSelected; } From bc24fd1a8994cd9a0dc82cfd4f5a790415b50599 Mon Sep 17 00:00:00 2001 From: cnkoster Date: Fri, 20 Nov 2026 15:33:48 +0100 Subject: [PATCH 3/4] remove double if statement --- PWGCF/Flow/Tasks/flowSP.cxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/PWGCF/Flow/Tasks/flowSP.cxx b/PWGCF/Flow/Tasks/flowSP.cxx index 539b7187530..c2ea969c59f 100644 --- a/PWGCF/Flow/Tasks/flowSP.cxx +++ b/PWGCF/Flow/Tasks/flowSP.cxx @@ -1359,9 +1359,7 @@ struct FlowSP { if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_GlobalTracks); fillSpectraStudyMCReco(trackSel_GlobalTracks); - } - - if (isTrackSelected) { + fillPrimaryHistos(mcParticle); if (spm.charge == kPositive) { fillPrimaryHistos(mcParticle); From 22ae8d735ac648f7618e87c44ed41127c187e825 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Fri, 20 Nov 2026 14:34:58 +0000 Subject: [PATCH 4/4] Please consider the following formatting changes --- PWGCF/Flow/Tasks/flowSP.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGCF/Flow/Tasks/flowSP.cxx b/PWGCF/Flow/Tasks/flowSP.cxx index c2ea969c59f..ced44e18b54 100644 --- a/PWGCF/Flow/Tasks/flowSP.cxx +++ b/PWGCF/Flow/Tasks/flowSP.cxx @@ -1359,7 +1359,7 @@ struct FlowSP { if (isTrackSelected) { histos.fill(HIST("hTrackCount"), trackSel_GlobalTracks); fillSpectraStudyMCReco(trackSel_GlobalTracks); - + fillPrimaryHistos(mcParticle); if (spm.charge == kPositive) { fillPrimaryHistos(mcParticle);