diff --git a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidAbsCrossSection.cxx b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidAbsCrossSection.cxx index aa8a79e6bc2..be5265ba3f4 100644 --- a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidAbsCrossSection.cxx +++ b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidAbsCrossSection.cxx @@ -32,7 +32,7 @@ using namespace o2::framework; struct HmpidAbsCrossSection { - HistogramRegistry registryDA{"registryDA", {}, OutputObjHandlingPolicy::AnalysisObject}; + HistogramRegistry registry{"registry", {}, OutputObjHandlingPolicy::AnalysisObject}; Configurable minReqClusterITS{"minReqClusterITS", 4.0, "min number of clusters required in ITS"}; Configurable minTPCnClsFound{"minTPCnClsFound", 50.0f, "minTPCnClsFound"}; @@ -110,67 +110,69 @@ struct HmpidAbsCrossSection { AxisSpec axisChamber{10, -1.5, 8.5, "Chamber number", "axisChamber"}; // 1D integrated histograms (quick view) - registryDA.add("incoming_Pos_8cm", "incoming_Pos_8cm", HistType::kTH1F, {axisMom}); - registryDA.add("incoming_Pos_4cm", "incoming_Pos_4cm", HistType::kTH1F, {axisMom}); + registry.add("incoming_Pos_8cm", "incoming_Pos_8cm", HistType::kTH1F, {axisMom}); + registry.add("incoming_Pos_4cm", "incoming_Pos_4cm", HistType::kTH1F, {axisMom}); - registryDA.add("DeltaR_Pos_8cm", "DeltaR_Pos_8cm", HistType::kTH1F, {axisDeltaR}); - registryDA.add("DeltaR_Pos_4cm", "DeltaR_Pos_4cm", HistType::kTH1F, {axisDeltaR}); + registry.add("DeltaR_Pos_8cm", "DeltaR_Pos_8cm", HistType::kTH1F, {axisDeltaR}); + registry.add("DeltaR_Pos_4cm", "DeltaR_Pos_4cm", HistType::kTH1F, {axisDeltaR}); - registryDA.add("incoming_Neg_8cm", "incoming_Neg_8cm", HistType::kTH1F, {axisMom}); - registryDA.add("incoming_Neg_4cm", "incoming_Neg_4cm", HistType::kTH1F, {axisMom}); + registry.add("incoming_Neg_8cm", "incoming_Neg_8cm", HistType::kTH1F, {axisMom}); + registry.add("incoming_Neg_4cm", "incoming_Neg_4cm", HistType::kTH1F, {axisMom}); - registryDA.add("DeltaR_Neg_8cm", "DeltaR_Neg_8cm", HistType::kTH1F, {axisDeltaR}); - registryDA.add("DeltaR_Neg_4cm", "DeltaR_Neg_4cm", HistType::kTH1F, {axisDeltaR}); + registry.add("DeltaR_Neg_8cm", "DeltaR_Neg_8cm", HistType::kTH1F, {axisDeltaR}); + registry.add("DeltaR_Neg_4cm", "DeltaR_Neg_4cm", HistType::kTH1F, {axisDeltaR}); // Positive candidates histograms - registryDA.add("nSigmaTPC_vs_momHMPID_PreCut_Pos_8cm", "nSigmaTPC_vs_momHMPID_PreCut_Pos_8cm", HistType::kTH2F, {axisMom, axisNsigmaTPC}); - registryDA.add("nSigmaTOF_vs_momHMPID_PreCut_Pos_8cm", "nSigmaTOF_vs_momHMPID_PreCut_Pos_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); - registryDA.add("nSigmaTPC_vs_momHMPID_PreCut_Pos_4cm", "nSigmaTPC_vs_momHMPID_PreCut_Pos_4cm", HistType::kTH2F, {axisMom, axisNsigmaTPC}); - registryDA.add("nSigmaTOF_vs_momHMPID_PreCut_Pos_4cm", "nSigmaTOF_vs_momHMPID_PreCut_Pos_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTPC_vs_momHMPID_PreCut_Pos_8cm", "nSigmaTPC_vs_momHMPID_PreCut_Pos_8cm", HistType::kTH2F, {axisMom, axisNsigmaTPC}); + registry.add("nSigmaTOF_vs_momHMPID_PreCut_Pos_8cm", "nSigmaTOF_vs_momHMPID_PreCut_Pos_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTPC_vs_momHMPID_PreCut_Pos_4cm", "nSigmaTPC_vs_momHMPID_PreCut_Pos_4cm", HistType::kTH2F, {axisMom, axisNsigmaTPC}); + registry.add("nSigmaTOF_vs_momHMPID_PreCut_Pos_4cm", "nSigmaTOF_vs_momHMPID_PreCut_Pos_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); // TPC only candidates histograms - registryDA.add("nSigmaTOF_vs_momHMPID_TPCOnly_Pos_8cm", "nSigmaTOF_vs_momHMPID_TPCOnly_Pos_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); - registryDA.add("nSigmaTOF_vs_momHMPID_TPCOnly_Pos_4cm", "nSigmaTOF_vs_momHMPID_TPCOnly_Pos_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTOF_vs_momHMPID_TPCOnly_Pos_8cm", "nSigmaTOF_vs_momHMPID_TPCOnly_Pos_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTOF_vs_momHMPID_TPCOnly_Pos_4cm", "nSigmaTOF_vs_momHMPID_TPCOnly_Pos_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); // after TPC+TOF cuts candidates histograms - registryDA.add("nSigmaTOF_vs_momHMPID_Pos_8cm", "nSigmaTOF_vs_momHMPID_Pos_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); - registryDA.add("nSigmaTOF_vs_momHMPID_Pos_4cm", "nSigmaTOF_vs_momHMPID_Pos_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTOF_vs_momHMPID_Pos_8cm", "nSigmaTOF_vs_momHMPID_Pos_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTOF_vs_momHMPID_Pos_4cm", "nSigmaTOF_vs_momHMPID_Pos_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); - registryDA.add("DeltaR_vs_momHMPID_Pos_8cm", "DeltaR_vs_momHMPID_Pos_8cm", HistType::kTH2F, {axisMom, axisDeltaR}); - registryDA.add("DeltaR_vs_momHMPID_Pos_4cm", "DeltaR_vs_momHMPID_Pos_4cm", HistType::kTH2F, {axisMom, axisDeltaR}); + registry.add("DeltaR_vs_momHMPID_Pos_8cm", "DeltaR_vs_momHMPID_Pos_8cm", HistType::kTH2F, {axisMom, axisDeltaR}); + registry.add("DeltaR_vs_momHMPID_Pos_4cm", "DeltaR_vs_momHMPID_Pos_4cm", HistType::kTH2F, {axisMom, axisDeltaR}); // corrected residuals distributions - registryDA.add("residualsX_Vs_momentum_Pos_8cm", "residualsX_Vs_momentum_Pos_8cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "x_{mip} - x_{track} (cm)"}}); - registryDA.add("residualsY_Vs_momentum_Pos_8cm", "residualsY_Vs_momentum_Pos_8cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "y_{mip} - y_{track} (cm)"}}); - registryDA.add("residualsX_Vs_momentum_Pos_4cm", "residualsX_Vs_momentum_Pos_4cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "x_{mip} - x_{track} (cm)"}}); - registryDA.add("residualsY_Vs_momentum_Pos_4cm", "residualsY_Vs_momentum_Pos_4cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "y_{mip} - y_{track} (cm)"}}); + registry.add("residualsX_Vs_momentum_Pos_8cm", "residualsX_Vs_momentum_Pos_8cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "x_{mip} - x_{track} (cm)"}}); + registry.add("residualsY_Vs_momentum_Pos_8cm", "residualsY_Vs_momentum_Pos_8cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "y_{mip} - y_{track} (cm)"}}); + registry.add("residualsX_Vs_momentum_Pos_4cm", "residualsX_Vs_momentum_Pos_4cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "x_{mip} - x_{track} (cm)"}}); + registry.add("residualsY_Vs_momentum_Pos_4cm", "residualsY_Vs_momentum_Pos_4cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "y_{mip} - y_{track} (cm)"}}); // Negative candidates histograms - registryDA.add("nSigmaTPC_vs_momHMPID_PreCut_Neg_8cm", "nSigmaTPC_vs_momHMPID_PreCut_Neg_8cm", HistType::kTH2F, {axisMom, axisNsigmaTPC}); - registryDA.add("nSigmaTOF_vs_momHMPID_PreCut_Neg_8cm", "nSigmaTOF_vs_momHMPID_PreCut_Neg_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); - registryDA.add("nSigmaTPC_vs_momHMPID_PreCut_Neg_4cm", "nSigmaTPC_vs_momHMPID_PreCut_Neg_4cm", HistType::kTH2F, {axisMom, axisNsigmaTPC}); - registryDA.add("nSigmaTOF_vs_momHMPID_PreCut_Neg_4cm", "nSigmaTOF_vs_momHMPID_PreCut_Neg_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTPC_vs_momHMPID_PreCut_Neg_8cm", "nSigmaTPC_vs_momHMPID_PreCut_Neg_8cm", HistType::kTH2F, {axisMom, axisNsigmaTPC}); + registry.add("nSigmaTOF_vs_momHMPID_PreCut_Neg_8cm", "nSigmaTOF_vs_momHMPID_PreCut_Neg_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTPC_vs_momHMPID_PreCut_Neg_4cm", "nSigmaTPC_vs_momHMPID_PreCut_Neg_4cm", HistType::kTH2F, {axisMom, axisNsigmaTPC}); + registry.add("nSigmaTOF_vs_momHMPID_PreCut_Neg_4cm", "nSigmaTOF_vs_momHMPID_PreCut_Neg_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); // TPC only candidates histograms - registryDA.add("nSigmaTOF_vs_momHMPID_TPCOnly_Neg_8cm", "nSigmaTOF_vs_momHMPID_TPCOnly_Neg_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); - registryDA.add("nSigmaTOF_vs_momHMPID_TPCOnly_Neg_4cm", "nSigmaTOF_vs_momHMPID_TPCOnly_Neg_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTOF_vs_momHMPID_TPCOnly_Neg_8cm", "nSigmaTOF_vs_momHMPID_TPCOnly_Neg_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTOF_vs_momHMPID_TPCOnly_Neg_4cm", "nSigmaTOF_vs_momHMPID_TPCOnly_Neg_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); // after TPC+TOF cuts candidates histograms - registryDA.add("nSigmaTOF_vs_momHMPID_Neg_8cm", "nSigmaTOF_vs_momHMPID_Neg_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); - registryDA.add("nSigmaTOF_vs_momHMPID_Neg_4cm", "nSigmaTOF_vs_momHMPID_Neg_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTOF_vs_momHMPID_Neg_8cm", "nSigmaTOF_vs_momHMPID_Neg_8cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); + registry.add("nSigmaTOF_vs_momHMPID_Neg_4cm", "nSigmaTOF_vs_momHMPID_Neg_4cm", HistType::kTH2F, {axisMom, axisNsigmaTOF}); - registryDA.add("DeltaR_vs_momHMPID_Neg_8cm", "DeltaR_vs_momHMPID_Neg_8cm", HistType::kTH2F, {axisMom, axisDeltaR}); - registryDA.add("DeltaR_vs_momHMPID_Neg_4cm", "DeltaR_vs_momHMPID_Neg_4cm", HistType::kTH2F, {axisMom, axisDeltaR}); + registry.add("DeltaR_vs_momHMPID_Neg_8cm", "DeltaR_vs_momHMPID_Neg_8cm", HistType::kTH2F, {axisMom, axisDeltaR}); + registry.add("DeltaR_vs_momHMPID_Neg_4cm", "DeltaR_vs_momHMPID_Neg_4cm", HistType::kTH2F, {axisMom, axisDeltaR}); // corrected residuals distributions - registryDA.add("residualsX_Vs_momentum_Neg_8cm", "residualsX_Vs_momentum_Neg_8cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "x_{mip} - x_{track} (cm)"}}); - registryDA.add("residualsY_Vs_momentum_Neg_8cm", "residualsY_Vs_momentum_Neg_8cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "y_{mip} - y_{track} (cm)"}}); - registryDA.add("residualsX_Vs_momentum_Neg_4cm", "residualsX_Vs_momentum_Neg_4cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "x_{mip} - x_{track} (cm)"}}); - registryDA.add("residualsY_Vs_momentum_Neg_4cm", "residualsY_Vs_momentum_Neg_4cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "y_{mip} - y_{track} (cm)"}}); - - // nsigma TPC vs nsigma TOF for candidates - registryDA.add("pidTPC_TOF_p_ch_Pos", "pidTPC_TOF_p_ch_Pos", HistType::kTHnSparseF, {axisMom, axisNsigmaTPC, axisNsigmaTOF, axisChamber}); - registryDA.add("pidTPC_TOF_p_ch_Neg", "pidTPC_TOF_p_ch_Neg", HistType::kTHnSparseF, {axisMom, axisNsigmaTPC, axisNsigmaTOF, axisChamber}); + registry.add("residualsX_Vs_momentum_Neg_8cm", "residualsX_Vs_momentum_Neg_8cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "x_{mip} - x_{track} (cm)"}}); + registry.add("residualsY_Vs_momentum_Neg_8cm", "residualsY_Vs_momentum_Neg_8cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "y_{mip} - y_{track} (cm)"}}); + registry.add("residualsX_Vs_momentum_Neg_4cm", "residualsX_Vs_momentum_Neg_4cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "x_{mip} - x_{track} (cm)"}}); + registry.add("residualsY_Vs_momentum_Neg_4cm", "residualsY_Vs_momentum_Neg_4cm", HistType::kTH2F, {axisMom, {400, -20.0f, 20.0f, "y_{mip} - y_{track} (cm)"}}); + + // multi-dimensional histograms for PID analysis + registry.add("pidTPC_TOF_p_ch_Pos", "pidTPC_TOF_p_ch_Pos", HistType::kTHnSparseF, {axisMom, axisNsigmaTPC, axisNsigmaTOF, axisChamber}); + registry.add("pidTPC_TOF_p_ch_Neg", "pidTPC_TOF_p_ch_Neg", HistType::kTHnSparseF, {axisMom, axisNsigmaTPC, axisNsigmaTOF, axisChamber}); + registry.add("nSigmaTPC_TOF_p_ch_deltaR_Pos", "nSigmaTPC_TOF_p_ch_deltaR_Pos", HistType::kTHnSparseF, {axisNsigmaTPC, axisNsigmaTOF, axisMom, axisDeltaR, axisChamber}); + registry.add("nSigmaTPC_TOF_p_ch_deltaR_Neg", "nSigmaTPC_TOF_p_ch_deltaR_Neg", HistType::kTHnSparseF, {axisNsigmaTPC, axisNsigmaTOF, axisMom, axisDeltaR, axisChamber}); } // end init void process(aod::HmpidAnalysis const& hmpidTable) @@ -243,13 +245,7 @@ struct HmpidAbsCrossSection { const float dyCorr = (hmpid.yMip() - hmpid.yTrack()) - usedOffsetY; const float drCorr = std::hypot(dxCorr, dyCorr); - // check only HMPID chamber with an absorber (only RICH 2 (4cm abs) and RICH4 (8cm abs)) - if (chamber != Rich2 && chamber != Rich4) { - continue; - } - // select particle species - float nSigmaTPC = 0.f; float nSigmaTOF = 0.f; @@ -275,25 +271,25 @@ struct HmpidAbsCrossSection { // nsigma distributions pre-cuts // ------------------------- if (isPos) { - registryDA.fill(HIST("pidTPC_TOF_p_ch_Pos"), momAbs, nSigmaTPC, nSigmaTOF, chamber); + registry.fill(HIST("pidTPC_TOF_p_ch_Pos"), momAbs, nSigmaTPC, nSigmaTOF, chamber); if (chamber == Rich2) { - registryDA.fill(HIST("nSigmaTPC_vs_momHMPID_PreCut_Pos_4cm"), momAbs, nSigmaTPC); - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_PreCut_Pos_4cm"), momAbs, nSigmaTOF); + registry.fill(HIST("nSigmaTPC_vs_momHMPID_PreCut_Pos_4cm"), momAbs, nSigmaTPC); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_PreCut_Pos_4cm"), momAbs, nSigmaTOF); } if (chamber == Rich4) { - registryDA.fill(HIST("nSigmaTPC_vs_momHMPID_PreCut_Pos_8cm"), momAbs, nSigmaTPC); - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_PreCut_Pos_8cm"), momAbs, nSigmaTOF); + registry.fill(HIST("nSigmaTPC_vs_momHMPID_PreCut_Pos_8cm"), momAbs, nSigmaTPC); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_PreCut_Pos_8cm"), momAbs, nSigmaTOF); } } if (isNeg) { - registryDA.fill(HIST("pidTPC_TOF_p_ch_Neg"), momAbs, nSigmaTPC, nSigmaTOF, chamber); + registry.fill(HIST("pidTPC_TOF_p_ch_Neg"), momAbs, nSigmaTPC, nSigmaTOF, chamber); if (chamber == Rich2) { - registryDA.fill(HIST("nSigmaTPC_vs_momHMPID_PreCut_Neg_4cm"), momAbs, nSigmaTPC); - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_PreCut_Neg_4cm"), momAbs, nSigmaTOF); + registry.fill(HIST("nSigmaTPC_vs_momHMPID_PreCut_Neg_4cm"), momAbs, nSigmaTPC); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_PreCut_Neg_4cm"), momAbs, nSigmaTOF); } if (chamber == Rich4) { - registryDA.fill(HIST("nSigmaTPC_vs_momHMPID_PreCut_Neg_8cm"), momAbs, nSigmaTPC); - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_PreCut_Neg_8cm"), momAbs, nSigmaTOF); + registry.fill(HIST("nSigmaTPC_vs_momHMPID_PreCut_Neg_8cm"), momAbs, nSigmaTPC); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_PreCut_Neg_8cm"), momAbs, nSigmaTOF); } } @@ -309,18 +305,18 @@ struct HmpidAbsCrossSection { // ------------------------- if (isPos) { if (chamber == Rich2) { - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_TPCOnly_Pos_8cm"), momAbs, nSigmaTOF); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_TPCOnly_Pos_4cm"), momAbs, nSigmaTOF); } if (chamber == Rich4) { - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_TPCOnly_Pos_4cm"), momAbs, nSigmaTOF); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_TPCOnly_Pos_8cm"), momAbs, nSigmaTOF); } } if (isNeg) { if (chamber == Rich2) { - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_TPCOnly_Neg_8cm"), momAbs, nSigmaTOF); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_TPCOnly_Neg_4cm"), momAbs, nSigmaTOF); } if (chamber == Rich4) { - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_TPCOnly_Neg_4cm"), momAbs, nSigmaTOF); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_TPCOnly_Neg_8cm"), momAbs, nSigmaTOF); } } @@ -338,44 +334,52 @@ struct HmpidAbsCrossSection { } } + // fill multi-dimensional histograms for PID analysis after TPC+TOF cuts + if (isPos) { + registry.fill(HIST("nSigmaTPC_TOF_p_ch_deltaR_Pos"), nSigmaTPC, nSigmaTOF, momAbs, drCorr, chamber); + } + if (isNeg) { + registry.fill(HIST("nSigmaTPC_TOF_p_ch_deltaR_Neg"), nSigmaTPC, nSigmaTOF, momAbs, drCorr, chamber); + } + // Fill distributions for absorption cross section measurement if (isPos && chamber == Rich4) { - registryDA.fill(HIST("incoming_Pos_8cm"), momAbs); - registryDA.fill(HIST("DeltaR_Pos_8cm"), drCorr); - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_Pos_8cm"), momAbs, nSigmaTOF); - registryDA.fill(HIST("DeltaR_vs_momHMPID_Pos_8cm"), momAbs, drCorr); - registryDA.fill(HIST("residualsX_Vs_momentum_Pos_8cm"), momAbs, dxCorr); - registryDA.fill(HIST("residualsY_Vs_momentum_Pos_8cm"), momAbs, dyCorr); + registry.fill(HIST("incoming_Pos_8cm"), momAbs); + registry.fill(HIST("DeltaR_Pos_8cm"), drCorr); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_Pos_8cm"), momAbs, nSigmaTOF); + registry.fill(HIST("DeltaR_vs_momHMPID_Pos_8cm"), momAbs, drCorr); + registry.fill(HIST("residualsX_Vs_momentum_Pos_8cm"), momAbs, dxCorr); + registry.fill(HIST("residualsY_Vs_momentum_Pos_8cm"), momAbs, dyCorr); } if (isNeg && chamber == Rich4) { - registryDA.fill(HIST("incoming_Neg_8cm"), momAbs); - registryDA.fill(HIST("DeltaR_Neg_8cm"), drCorr); - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_Neg_8cm"), momAbs, nSigmaTOF); - registryDA.fill(HIST("DeltaR_vs_momHMPID_Neg_8cm"), momAbs, drCorr); + registry.fill(HIST("incoming_Neg_8cm"), momAbs); + registry.fill(HIST("DeltaR_Neg_8cm"), drCorr); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_Neg_8cm"), momAbs, nSigmaTOF); + registry.fill(HIST("DeltaR_vs_momHMPID_Neg_8cm"), momAbs, drCorr); - registryDA.fill(HIST("residualsX_Vs_momentum_Neg_8cm"), momAbs, dxCorr); - registryDA.fill(HIST("residualsY_Vs_momentum_Neg_8cm"), momAbs, dyCorr); + registry.fill(HIST("residualsX_Vs_momentum_Neg_8cm"), momAbs, dxCorr); + registry.fill(HIST("residualsY_Vs_momentum_Neg_8cm"), momAbs, dyCorr); } if (isPos && chamber == Rich2) { - registryDA.fill(HIST("incoming_Pos_4cm"), momAbs); - registryDA.fill(HIST("DeltaR_Pos_4cm"), drCorr); - registryDA.fill(HIST("DeltaR_vs_momHMPID_Pos_4cm"), momAbs, drCorr); - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_Pos_4cm"), momAbs, nSigmaTOF); + registry.fill(HIST("incoming_Pos_4cm"), momAbs); + registry.fill(HIST("DeltaR_Pos_4cm"), drCorr); + registry.fill(HIST("DeltaR_vs_momHMPID_Pos_4cm"), momAbs, drCorr); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_Pos_4cm"), momAbs, nSigmaTOF); - registryDA.fill(HIST("residualsX_Vs_momentum_Pos_4cm"), momAbs, dxCorr); - registryDA.fill(HIST("residualsY_Vs_momentum_Pos_4cm"), momAbs, dyCorr); + registry.fill(HIST("residualsX_Vs_momentum_Pos_4cm"), momAbs, dxCorr); + registry.fill(HIST("residualsY_Vs_momentum_Pos_4cm"), momAbs, dyCorr); } if (isNeg && chamber == Rich2) { - registryDA.fill(HIST("incoming_Neg_4cm"), momAbs); - registryDA.fill(HIST("DeltaR_Neg_4cm"), drCorr); - registryDA.fill(HIST("DeltaR_vs_momHMPID_Neg_4cm"), momAbs, drCorr); - registryDA.fill(HIST("nSigmaTOF_vs_momHMPID_Neg_4cm"), momAbs, nSigmaTOF); + registry.fill(HIST("incoming_Neg_4cm"), momAbs); + registry.fill(HIST("DeltaR_Neg_4cm"), drCorr); + registry.fill(HIST("DeltaR_vs_momHMPID_Neg_4cm"), momAbs, drCorr); + registry.fill(HIST("nSigmaTOF_vs_momHMPID_Neg_4cm"), momAbs, nSigmaTOF); - registryDA.fill(HIST("residualsX_Vs_momentum_Neg_4cm"), momAbs, dxCorr); - registryDA.fill(HIST("residualsY_Vs_momentum_Neg_4cm"), momAbs, dyCorr); + registry.fill(HIST("residualsX_Vs_momentum_Neg_4cm"), momAbs, dxCorr); + registry.fill(HIST("residualsY_Vs_momentum_Neg_4cm"), momAbs, dyCorr); } } // end of loop over hmpidTable } // end of process diff --git a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidCrossSectionCorrections.cxx b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidCrossSectionCorrections.cxx index 8ca94444d60..ec5270c3fa7 100644 --- a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidCrossSectionCorrections.cxx +++ b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidCrossSectionCorrections.cxx @@ -44,8 +44,8 @@ struct HmpidCrossSectionCorrections { // Configurables for QA selection Configurable qMipMin{"qMipMin", 200.0f, "minimum MIP charge for QA selection"}; - Configurable qMipMax{"qMipMax", 2000.0f, "maximum MIP charge for QA selection"}; - Configurable cutDistanceMipTrack{"cutDistanceMipTrack", 10.0f, "maximum raw MIP-track distance for QA selection"}; + Configurable qMipMax{"qMipMax", 2500.0f, "maximum MIP charge for QA selection"}; + Configurable cutDistanceMipTrack{"cutDistanceMipTrack", 30.0f, "maximum raw MIP-track distance for QA selection"}; // Configurables for plotting Configurable momNBins{"momNBins", 490, "Momentum bins"}; @@ -60,9 +60,10 @@ struct HmpidCrossSectionCorrections { Configurable phiMin{"phiMin", -10.0f, "Phi min"}; Configurable phiMax{"phiMax", 10.0f, "Phi max"}; - Configurable mapNBins{"mapNBins", 135, "Map bins (x or y)"}; + // Achieved precision is 8 mm (similar to PAD size - X -> 8mm, Y -> 8.4 mm) + Configurable mapNBins{"mapNBins", 170, "Map bins (x)"}; Configurable mapMin{"mapMin", 0.0f, "Map min (x or y) in cm"}; - Configurable mapMax{"mapMax", 135.0f, "Map max (x or y) in cm"}; + Configurable mapMax{"mapMax", 136.0f, "Map max (x or y) in cm"}; Configurable residualsNBins{"residualsNBins", 400, "Residuals bins"}; Configurable residualsMin{"residualsMin", -20.0f, "Residuals min (x or y) in cm"}; @@ -94,6 +95,11 @@ struct HmpidCrossSectionCorrections { registry.add(Form("hmpidXYHmpidMipRich%dNeg", iCh), "MIP XY - Q_{MIP} cut;X_{MIP} (cm);Y_{MIP} (cm)", HistType::kTHnSparseF, {axisHmpidMom, axisMipX, axisMipY}); registry.add(Form("hmpidXYGlobalTrackRich%dNeg", iCh), "Global track XY - all;X_{track} (cm);Y_{track} (cm)", HistType::kTHnSparseF, {axisGlobalMom, axisGlobalTrackX, axisGlobalTrackY}); + registry.add(Form("hMomentumDistributionAllRich%dPos", iCh), Form("hMomentumDistributionAllRich%dPos", iCh), HistType::kTH1F, {axisHmpidMom}); + registry.add(Form("hMomentumDistributionAllRich%dNeg", iCh), Form("hMomentumDistributionAllRich%dNeg", iCh), HistType::kTH1F, {axisHmpidMom}); + registry.add(Form("hMomentumDistributionCutRich%dPos", iCh), Form("hMomentumDistributionCutRich%dPos", iCh), HistType::kTH1F, {axisHmpidMom}); + registry.add(Form("hMomentumDistributionCutRich%dNeg", iCh), Form("hMomentumDistributionCutRich%dNeg", iCh), HistType::kTH1F, {axisHmpidMom}); + registry.add(Form("residualsXVsMomentumRich%dPos", iCh), Form("residualsXVsMomentumRich%dPos", iCh), HistType::kTH2F, {axisHmpidMom, axisResiduals}); registry.add(Form("residualsYVsMomentumRich%dPos", iCh), Form("residualsYVsMomentumRich%dPos", iCh), HistType::kTH2F, {axisHmpidMom, axisResiduals}); registry.add(Form("residualsXVsMomentumRich%dNeg", iCh), Form("residualsXVsMomentumRich%dNeg", iCh), HistType::kTH2F, {axisHmpidMom, axisResiduals}); @@ -147,6 +153,7 @@ struct HmpidCrossSectionCorrections { const bool isPos = momHmpid > 0; const bool isNeg = momHmpid < 0; const bool passQ = hmpid.chargeMip() > qMipMin && hmpid.chargeMip() < qMipMax; + const bool passDistance = std::hypot(hmpid.xTrack() - hmpid.xMip(), hmpid.yTrack() - hmpid.yMip()) < cutDistanceMipTrack; switch (chamber) { case Rich0: @@ -164,6 +171,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich0Pos"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich0Pos"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich0Pos"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich0Pos"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich0Pos"), momTrackAbs); + } } if (isNeg) { if (passQ) { @@ -177,6 +189,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich0Neg"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich0Neg"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich0Neg"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich0Neg"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich0Neg"), momTrackAbs); + } } break; case Rich1: @@ -194,6 +211,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich1Pos"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich1Pos"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich1Pos"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich1Pos"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich1Pos"), momTrackAbs); + } } if (isNeg) { if (passQ) { @@ -207,6 +229,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich1Neg"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich1Neg"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich1Neg"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich1Neg"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich1Neg"), momTrackAbs); + } } break; case Rich2: @@ -224,6 +251,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich2Pos"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich2Pos"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich2Pos"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich2Pos"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich2Pos"), momTrackAbs); + } } if (isNeg) { if (passQ) { @@ -237,6 +269,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich2Neg"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich2Neg"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich2Neg"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich2Neg"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich2Neg"), momTrackAbs); + } } break; case Rich3: @@ -254,6 +291,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich3Pos"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich3Pos"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich3Pos"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich3Pos"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich3Pos"), momTrackAbs); + } } if (isNeg) { if (passQ) { @@ -267,6 +309,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich3Neg"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich3Neg"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich3Neg"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich3Neg"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich3Neg"), momTrackAbs); + } } break; case Rich4: @@ -284,6 +331,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich4Pos"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich4Pos"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich4Pos"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich4Pos"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich4Pos"), momTrackAbs); + } } if (isNeg) { if (passQ) { @@ -297,6 +349,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich4Neg"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich4Neg"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich4Neg"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich4Neg"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich4Neg"), momTrackAbs); + } } break; case Rich5: @@ -314,6 +371,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich5Pos"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich5Pos"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich5Pos"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich5Pos"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich5Pos"), momTrackAbs); + } } if (isNeg) { if (passQ) { @@ -327,6 +389,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich5Neg"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich5Neg"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich5Neg"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich5Neg"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich5Neg"), momTrackAbs); + } } break; case Rich6: @@ -344,6 +411,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich6Pos"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich6Pos"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich6Pos"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich6Pos"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich6Pos"), momTrackAbs); + } } if (isNeg) { if (passQ) { @@ -357,6 +429,11 @@ struct HmpidCrossSectionCorrections { registry.fill(HIST("hMomTrackVsHmpidRich6Neg"), momTrackAbs, momHmpidAbs); registry.fill(HIST("hXTrackVsXMipRich6Neg"), hmpid.xTrack(), hmpid.xMip()); registry.fill(HIST("hYTrackVsYMipRich6Neg"), hmpid.yTrack(), hmpid.yMip()); + + registry.fill(HIST("hMomentumDistributionAllRich6Neg"), momTrackAbs); + if (passDistance && passQ) { + registry.fill(HIST("hMomentumDistributionCutRich6Neg"), momTrackAbs); + } } break; default: