From e5ae9f4e32257fce031b1c7ef4a89f789c88788c Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Thu, 30 Jul 2026 18:15:11 +0200 Subject: [PATCH 01/11] PWGDQ: Add and fix configurable options for optimize memory issue --- PWGDQ/Core/HistogramsLibrary.cxx | 16 ++++- PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 58 ++++++++++++++----- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index c15894fbb8b..e11c84ecdc4 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -1257,15 +1257,25 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h hm->AddHistogram(histClass, "Coschi", "", false, 25, coschiBins.data(), VarManager::kMCCosChi, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kMCWeight); } - if (groupStr.CompareTo("polarization-pseudoproper-gen") == 0) { + if (groupStr.CompareTo("polarization-pseudoproper-midy-he-gen") == 0) { std::array varspTHE = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaHE, VarManager::kMCVertexingTauxyProjected}; - std::array varspTCS = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCVertexingTauxyProjected}; - std::array varspTRM = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaRM, VarManager::kMCVertexingTauxyProjected}; std::array bins = {50, 20, 20, 1000}; std::array xmin = {2., 0., -1., -0.5}; std::array xmax = {4., 20., 1., 0.5}; hm->AddHistogram(histClass, "Mass_Pt_cosThetaHE_Tauxy", "", 4, varspTHE.data(), bins.data(), xmin.data(), xmax.data(), nullptr, -1, kFALSE); + } + if (groupStr.CompareTo("polarization-pseudoproper-midy-cs-gen") == 0) { + std::array varspTCS = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCVertexingTauxyProjected}; + std::array bins = {50, 20, 20, 1000}; + std::array xmin = {2., 0., -1., -0.5}; + std::array xmax = {4., 20., 1., 0.5}; hm->AddHistogram(histClass, "Mass_Pt_cosThetaCS_Tauxy", "", 4, varspTCS.data(), bins.data(), xmin.data(), xmax.data(), nullptr, -1, kFALSE); + } + if (groupStr.CompareTo("polarization-pseudoproper-midy-rand-gen") == 0) { + std::array varspTRM = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaRM, VarManager::kMCVertexingTauxyProjected}; + std::array bins = {50, 20, 20, 1000}; + std::array xmin = {2., 0., -1., -0.5}; + std::array xmax = {4., 20., 1., 0.5}; hm->AddHistogram(histClass, "Mass_Pt_cosThetaRM_Tauxy", "", 4, varspTRM.data(), bins.data(), xmin.data(), xmax.data(), nullptr, -1, kFALSE); } if (groupStr.CompareTo("polarization-dielectron-pbpb-midy-he-gen") == 0) { diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index a064a274bd3..502bf9705f0 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -1141,7 +1141,9 @@ struct AnalysisSameEventPairing { Configurable pair{"cfgPairCuts", "", "Comma separated list of pair cuts, !!! Use only if you know what you are doing, otherwise leave empty"}; Configurable fConfigQA{"cfgQA", false, "If true, fill QA histograms"}; Configurable fConfigMCtruthQA{"cfgMCtruthQA", false, "If true, fill QA histograms with default"}; - Configurable fConfigPseudoQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization"}; + Configurable fConfigPseudoHEQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization HE"}; + Configurable fConfigPseudoCSQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization CS"}; + Configurable fConfigPseudoRMQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization RM"}; Configurable fConfigTruthPbPbMIDYHE{"cfgTruthPbPbmidyHE", false, "If true, fill QA histograms with dielectron pairs in helicity frame"}; Configurable fConfigTruthPbPbMIDYCS{"cfgTruthPbPbmidyCS", false, "If true, fill QA histograms with dielectron pairs in collion-soper frame"}; Configurable fConfigAddSEPHistogram{"cfgAddSEPHistogram", "", "Comma separated list of histograms"}; @@ -1506,14 +1508,20 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigMCtruthQA.value) { histNames += Form("MCTruthGenPairSel_%s;", sig->GetName()); // after event selection } - if (fConfigOptions.fConfigPseudoQA.value) { - histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName()); + if (fConfigOptions.fConfigPseudoHEQA.value) { + histNames += Form("MCTruthGenPseudoPolPairHESel_%s;", sig->GetName()); + } + if (fConfigOptions.fConfigPseudoCSQA.value) { + histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); + } + if (fConfigOptions.fConfigPseudoRMQA.value) { + histNames += Form("MCTruthGenPseudoPolPairRMSel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { - histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName()); + histNames += Form("MCTruthGenPoldielectronPbPbPairSel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { - histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName()); + histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); } fHasTwoProngGenMCsignals = true; } @@ -1523,8 +1531,14 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigMCtruthQA.value) { histNames += Form("MCTruthGenPairSel_%s_%s;", sig->GetName(), cut->GetName()); // after event selection and MCgenAcc cut } - if (fConfigOptions.fConfigPseudoQA.value) { - histNames += Form("MCTruthGenPseudoPolPairSel_%s_%s;", sig->GetName(), cut->GetName()); + if (fConfigOptions.fConfigPseudoHEQA.value) { + histNames += Form("MCTruthGenPseudoPolPairHESel_%s_%s;", sig->GetName(), cut->GetName()); + } + if (fConfigOptions.fConfigPseudoCSQA.value) { + histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); + } + if (fConfigOptions.fConfigPseudoRMQA.value) { + histNames += Form("MCTruthGenPseudoPolPairRMSel_%s_%s;", sig->GetName(), cut->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { histNames += Form("MCTruthGenPoldielectronPbPbPairHESel_%s_%s;", sig->GetName(), cut->GetName()); @@ -2189,8 +2203,14 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigMCtruthQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoQA.value) { - fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairSel_%s", sig->GetName()), VarManager::fgValues); + if (fConfigOptions.fConfigPseudoHEQA.value) { + fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s", sig->GetName()), VarManager::fgValues); + } + if (fConfigOptions.fConfigPseudoCSQA.value) { + fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s", sig->GetName()), VarManager::fgValues); + } + if (fConfigOptions.fConfigPseudoRMQA.value) { + fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s", sig->GetName()), VarManager::fgValues); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName()), VarManager::fgValues); @@ -2205,8 +2225,14 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigMCtruthQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoQA.value) { - fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); + if (fConfigOptions.fConfigPseudoHEQA.value) { + fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); + } + if (fConfigOptions.fConfigPseudoCSQA.value) { + fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); + } + if (fConfigOptions.fConfigPseudoRMQA.value) { + fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -3215,8 +3241,14 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char if (classStr.Contains("MCTruthGenPair")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "mctruth_pair", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPair")) { - dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-gen", histName); + if (classStr.Contains("MCTruthGenPseudoPolPairHE")) { + dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-he-gen", histName); + } + if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { + dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-cs-gen", histName); + } + if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { + dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-rand-gen", histName); } if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-dielectron-pbpb-midy-he-gen", histName); From 29c8c215e5edde035043e5d0fb6d7a8d669ee473 Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Thu, 30 Jul 2026 18:19:31 +0200 Subject: [PATCH 02/11] PWGDQ: Add and fix configurable options for optimize memory issue --- .../Tasks/.#dqEfficiency_withAssoc_direct.cxx | 1 + PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 20 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 120000 PWGDQ/Tasks/.#dqEfficiency_withAssoc_direct.cxx diff --git a/PWGDQ/Tasks/.#dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/.#dqEfficiency_withAssoc_direct.cxx new file mode 120000 index 00000000000..b0f151e360c --- /dev/null +++ b/PWGDQ/Tasks/.#dqEfficiency_withAssoc_direct.cxx @@ -0,0 +1 @@ +dmallick@Dukhishyams-MacBook-Pro.local.50478 \ No newline at end of file diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index 502bf9705f0..1dd690cc5c1 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -1511,10 +1511,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -1534,10 +1534,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s_%s;", sig->GetName(), cut->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2206,10 +2206,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s", sig->GetName()), VarManager::fgValues); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2228,10 +2228,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } @@ -3244,10 +3244,10 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char if (classStr.Contains("MCTruthGenPseudoPolPairHE")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-he-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { + if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-cs-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { + if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-rand-gen", histName); } if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) { From c98352cd2fdbd96c0a106652213bf11a98799029 Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Thu, 30 Jul 2026 18:22:23 +0200 Subject: [PATCH 03/11] PWGDQ: Add and fix configurable options for optimize memory issue --- .../Tasks/.#dqEfficiency_withAssoc_direct.cxx | 1 - PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 22 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) delete mode 120000 PWGDQ/Tasks/.#dqEfficiency_withAssoc_direct.cxx diff --git a/PWGDQ/Tasks/.#dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/.#dqEfficiency_withAssoc_direct.cxx deleted file mode 120000 index b0f151e360c..00000000000 --- a/PWGDQ/Tasks/.#dqEfficiency_withAssoc_direct.cxx +++ /dev/null @@ -1 +0,0 @@ -dmallick@Dukhishyams-MacBook-Pro.local.50478 \ No newline at end of file diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index 1dd690cc5c1..e7a43216639 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -1511,14 +1511,14 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { - histNames += Form("MCTruthGenPoldielectronPbPbPairSel_%s;", sig->GetName()); + histNames += Form("MCTruthGenPoldielectronPbPbPairHESel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); @@ -1534,10 +1534,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s_%s;", sig->GetName(), cut->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2206,10 +2206,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s", sig->GetName()), VarManager::fgValues); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2228,10 +2228,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } @@ -3244,10 +3244,10 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char if (classStr.Contains("MCTruthGenPseudoPolPairHE")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-he-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { + if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-cs-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { + if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-rand-gen", histName); } if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) { From 5b8446e094a403805349f2120c050c0c1265698a Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Thu, 30 Jul 2026 18:38:31 +0200 Subject: [PATCH 04/11] PWGDQ: Add and fix configurable options for optimize memory issue --- PWGDQ/Core/HistogramsLibrary.cxx | 12 +++++------ PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 20 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index e11c84ecdc4..83a75fde02b 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -1263,14 +1263,14 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h std::array xmin = {2., 0., -1., -0.5}; std::array xmax = {4., 20., 1., 0.5}; hm->AddHistogram(histClass, "Mass_Pt_cosThetaHE_Tauxy", "", 4, varspTHE.data(), bins.data(), xmin.data(), xmax.data(), nullptr, -1, kFALSE); - } + } if (groupStr.CompareTo("polarization-pseudoproper-midy-cs-gen") == 0) { - std::array varspTCS = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCVertexingTauxyProjected}; - std::array bins = {50, 20, 20, 1000}; - std::array xmin = {2., 0., -1., -0.5}; - std::array xmax = {4., 20., 1., 0.5}; + std::array varspTCS = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCVertexingTauxyProjected}; + std::array bins = {50, 20, 20, 1000}; + std::array xmin = {2., 0., -1., -0.5}; + std::array xmax = {4., 20., 1., 0.5}; hm->AddHistogram(histClass, "Mass_Pt_cosThetaCS_Tauxy", "", 4, varspTCS.data(), bins.data(), xmin.data(), xmax.data(), nullptr, -1, kFALSE); - } + } if (groupStr.CompareTo("polarization-pseudoproper-midy-rand-gen") == 0) { std::array varspTRM = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaRM, VarManager::kMCVertexingTauxyProjected}; std::array bins = {50, 20, 20, 1000}; diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index e7a43216639..e30cc03c644 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -1511,10 +1511,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -1534,10 +1534,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s_%s;", sig->GetName(), cut->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2206,10 +2206,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s", sig->GetName()), VarManager::fgValues); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2228,10 +2228,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } @@ -3244,10 +3244,10 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char if (classStr.Contains("MCTruthGenPseudoPolPairHE")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-he-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { + if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-cs-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { + if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-rand-gen", histName); } if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) { From 652307e5cb835ebe933be9f6816405681ec38e61 Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Thu, 30 Jul 2026 21:21:42 +0200 Subject: [PATCH 05/11] PWGDQ: Add and fix configurable options for optimize memory issue --- PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index e30cc03c644..bbd956fe5c3 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -1141,9 +1141,9 @@ struct AnalysisSameEventPairing { Configurable pair{"cfgPairCuts", "", "Comma separated list of pair cuts, !!! Use only if you know what you are doing, otherwise leave empty"}; Configurable fConfigQA{"cfgQA", false, "If true, fill QA histograms"}; Configurable fConfigMCtruthQA{"cfgMCtruthQA", false, "If true, fill QA histograms with default"}; - Configurable fConfigPseudoHEQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization HE"}; - Configurable fConfigPseudoCSQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization CS"}; - Configurable fConfigPseudoRMQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization RM"}; + Configurable fConfigPseudoHEQA{"cfgPseudoHEQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization HE"}; + Configurable fConfigPseudoCSQA{"cfgPseudoCSQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization CS"}; + Configurable fConfigPseudoRMQA{"cfgPseudoRMQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization RM"}; Configurable fConfigTruthPbPbMIDYHE{"cfgTruthPbPbmidyHE", false, "If true, fill QA histograms with dielectron pairs in helicity frame"}; Configurable fConfigTruthPbPbMIDYCS{"cfgTruthPbPbmidyCS", false, "If true, fill QA histograms with dielectron pairs in collion-soper frame"}; Configurable fConfigAddSEPHistogram{"cfgAddSEPHistogram", "", "Comma separated list of histograms"}; @@ -1511,17 +1511,17 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { histNames += Form("MCTruthGenPoldielectronPbPbPairHESel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { - histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); + histNames += Form("MCTruthGenPoldielectronPbPbPairCSSel_%s;", sig->GetName()); } fHasTwoProngGenMCsignals = true; } @@ -1534,17 +1534,17 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s_%s;", sig->GetName(), cut->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { histNames += Form("MCTruthGenPoldielectronPbPbPairHESel_%s_%s;", sig->GetName(), cut->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { - histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); + histNames += Form("MCTruthGenPoldielectronPbPbPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); } } } @@ -2206,10 +2206,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s", sig->GetName()), VarManager::fgValues); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2228,10 +2228,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } @@ -3244,10 +3244,10 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char if (classStr.Contains("MCTruthGenPseudoPolPairHE")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-he-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { + if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-cs-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { + if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-rand-gen", histName); } if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) { From ec8037a65d17fff1e184c68b6b8d5af9138defa6 Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Thu, 30 Jul 2026 21:25:08 +0200 Subject: [PATCH 06/11] PWGDQ: Add and fix configurable options for optimize memory issue --- PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index bbd956fe5c3..c33f2ee24d4 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -1511,10 +1511,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -1534,10 +1534,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s_%s;", sig->GetName(), cut->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2206,10 +2206,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s", sig->GetName()), VarManager::fgValues); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2228,10 +2228,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } @@ -3244,10 +3244,10 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char if (classStr.Contains("MCTruthGenPseudoPolPairHE")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-he-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { + if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-cs-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { + if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-rand-gen", histName); } if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) { From 10d5d382bf7e3298b707ea25df9f54291c341fcc Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Thu, 30 Jul 2026 22:49:52 +0200 Subject: [PATCH 07/11] PWGDQ: Add and fix configurable options for optimize memory issue --- PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index c33f2ee24d4..6ecaf7deb86 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -331,7 +331,7 @@ struct AnalysisEventSelection { HistogramManager* fHistMan = nullptr; - AnalysisCompositeCut* fEventCut; + AnalysisCompositeCut* fEventCut = nullptr; Service fCCDB; o2::ccdb::CcdbApi fCCDBApi; @@ -1511,10 +1511,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -1534,10 +1534,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s_%s;", sig->GetName(), cut->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2206,10 +2206,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s", sig->GetName()), VarManager::fgValues); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2228,10 +2228,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } @@ -3244,10 +3244,10 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char if (classStr.Contains("MCTruthGenPseudoPolPairHE")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-he-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { + if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-cs-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { + if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-rand-gen", histName); } if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) { From 802d723fa3cef478c3e401928373f975c630cd5a Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Thu, 30 Jul 2026 22:55:42 +0200 Subject: [PATCH 08/11] PWGDQ:Fix white space --- PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index 6ecaf7deb86..500dd36db6d 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -1511,10 +1511,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s;", sig->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -1534,10 +1534,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { histNames += Form("MCTruthGenPseudoPolPairHESel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { histNames += Form("MCTruthGenPseudoPolPairRMSel_%s_%s;", sig->GetName(), cut->GetName()); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2206,10 +2206,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s", sig->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s", sig->GetName()), VarManager::fgValues); } if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { @@ -2228,10 +2228,10 @@ struct AnalysisSameEventPairing { if (fConfigOptions.fConfigPseudoHEQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoCSQA.value) { + if (fConfigOptions.fConfigPseudoCSQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } - if (fConfigOptions.fConfigPseudoRMQA.value) { + if (fConfigOptions.fConfigPseudoRMQA.value) { fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); } @@ -3244,10 +3244,10 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char if (classStr.Contains("MCTruthGenPseudoPolPairHE")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-he-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { + if (classStr.Contains("MCTruthGenPseudoPolPairCS")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-cs-gen", histName); } - if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { + if (classStr.Contains("MCTruthGenPseudoPolPairRM")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-rand-gen", histName); } if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) { From 9b5efbefa025a75d23cda9f38e3739eb8e17d8a8 Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Fri, 31 Jul 2026 17:18:38 +0200 Subject: [PATCH 09/11] PWGDQ:Fix Megalinter initialization issue --- PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index 500dd36db6d..bd525123f7c 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -338,7 +338,7 @@ struct AnalysisEventSelection { std::map fSelMap; // key: reduced event global index, value: event selection decision std::map> fBCCollMap; // key: global BC, value: vector of reduced event global indices - int fCurrentRun; + int fCurrentRun = nullptr; void init(o2::framework::InitContext& context) { @@ -595,13 +595,13 @@ struct AnalysisTrackSelection { Service fCCDB; Service fTofResponse; - HistogramManager* fHistMan; + HistogramManager* fHistMan = nullptr; std::vector fTrackCuts; std::vector fMCSignals; // list of signals to be checked std::vector fHistNamesReco; std::vector fHistNamesMCMatched; - int fCurrentRun; // current run (needed to detect run changes for loading CCDB parameters) + int fCurrentRun = nullptr; // current run (needed to detect run changes for loading CCDB parameters) std::map> fNAssocsInBunch; // key: track global index, value: vector of global index for events associated in-bunch (events that have in-bunch pileup or splitting) std::map> fNAssocsOutOfBunch; // key: track global index, value: vector of global index for events associated out-of-bunch (events that have no in-bunch pileup) @@ -938,9 +938,9 @@ struct AnalysisPrefilterSelection { Configurable fPropTrack{"cfgPropTrack", false, "Propagate tracks to associated collision to recalculate DCA and momentum vector"}; std::map fPrefilterMap; - AnalysisCompositeCut* fPairCut; - uint32_t fPrefilterMask; - int fPrefilterCutBit; + AnalysisCompositeCut* fPairCut = nullptr; + uint32_t fPrefilterMask = nullptr; + int fPrefilterCutBit = nullptr; Preslice trackAssocsPerCollision = aod::track_association::collisionId; @@ -1206,14 +1206,14 @@ struct AnalysisSameEventPairing { std::vector fMCGenAccCuts; bool fUseMCGenAccCut = false; - uint32_t fTrackFilterMask; // mask for the track cuts required in this task to be applied on the barrel cuts produced upstream - uint32_t fMuonFilterMask; // mask for the muon cuts required in this task to be applied on the muon cuts produced upstream - int fNCutsBarrel; - int fNCutsMuon; - int fNPairCuts; + uint32_t fTrackFilterMask = nullptr; // mask for the track cuts required in this task to be applied on the barrel cuts produced upstream + uint32_t fMuonFilterMask = nullptr; // mask for the muon cuts required in this task to be applied on the muon cuts produced upstream + int fNCutsBarrel = nullptr; + int fNCutsMuon = nullptr; + int fNPairCuts = nullptr; bool fHasTwoProngGenMCsignals = false; - bool fEnableBarrelHistos; + bool fEnableBarrelHistos = nullptr; // bool fEnableMuonHistos; Preslice> trackAssocsPerCollision = aod::track_association::collisionId; @@ -2337,13 +2337,13 @@ struct AnalysisDileptonTrack { Configurable fConfigMCGenSignalHadronJSON{"cfgMCGenSignalHadronJSON", "", "generator level hadron signal (JSON format), used for MC level combinatorics"}; } fConfigMCOptions; - int fCurrentRun; // needed to detect if the run changed and trigger update of calibrations etc. - int fNCuts; - int fNLegCuts; - int fNPairCuts; - int fNCommonTrackCuts; + int fCurrentRun = nullptr; // needed to detect if the run changed and trigger update of calibrations etc. + int fNCuts = nullptr; + int fNLegCuts = nullptr; + int fNPairCuts = nullptr; + int fNCommonTrackCuts = nullptr; std::map fCommonTrackCutMap; - uint32_t fTrackCutBitMap; // track cut bit mask to be used in the selection of tracks associated with dileptons + uint32_t fTrackCutBitMap = nullptr; // track cut bit mask to be used in the selection of tracks associated with dileptons // vector for single-lepton and track cut names for easy access when calling FillHistogramList() std::vector fTrackCutNames; std::vector fLegCutNames; @@ -2360,14 +2360,14 @@ struct AnalysisDileptonTrack { // Filter filterMuon = aod::dqanalysisflags::isMuonSelected > static_cast(0); // use two values array to avoid mixing up the quantities - float* fValuesDilepton; - float* fValuesHadron; - HistogramManager* fHistMan; + float* fValuesDilepton = nullptr; + float* fValuesHadron = nullptr; + HistogramManager* fHistMan = nullptr; std::vector fRecMCSignals; std::vector fGenMCSignals; - MCSignal* fDileptonLegSignal; - MCSignal* fHadronSignal; + MCSignal* fDileptonLegSignal = nullptr; + MCSignal* fHadronSignal = nullptr; void init(o2::framework::InitContext& context) { @@ -2379,7 +2379,7 @@ struct AnalysisDileptonTrack { bool isDummy = context.mOptions.get("processDummy"); if (isDummy) { - if (isBarrel || isMCGen /*|| isBarrelAsymmetric*/ /*|| isMuon*/) { + if (isBarrel || isMCGen) { LOG(fatal) << "Dummy function is enabled even if there are normal process functions running! Fix your config!" << endl; } else { LOG(info) << "Dummy function is enabled. Skipping the rest of the init function" << endl; @@ -2602,13 +2602,13 @@ struct AnalysisDileptonTrack { fNLegCuts = fNCuts; // loop over single lepton cuts - if (isBarrel /*|| isBarrelAsymmetric*/ /* || isMuon*/) { + if (isBarrel) { for (int icut = 0; icut < fNLegCuts; ++icut) { TString pairLegCutName; // here we check that this cut is one of those used for building the dileptons - if (isBarrel /*|| isMuon*/) { + if (isBarrel) { if (!cfgPairing_objArrayTrackCuts->FindObject(fTrackCutNames[icut].Data())) { continue; } From e60e93d2fc7dc54fddda88acfc5d55fd979bd9a8 Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Fri, 31 Jul 2026 20:00:13 +0200 Subject: [PATCH 10/11] PWGDQ:Fix Megalinter related --- PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index bd525123f7c..eac4b4d5464 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -338,7 +338,7 @@ struct AnalysisEventSelection { std::map fSelMap; // key: reduced event global index, value: event selection decision std::map> fBCCollMap; // key: global BC, value: vector of reduced event global indices - int fCurrentRun = nullptr; + int fCurrentRun = 0; void init(o2::framework::InitContext& context) { @@ -601,7 +601,7 @@ struct AnalysisTrackSelection { std::vector fHistNamesReco; std::vector fHistNamesMCMatched; - int fCurrentRun = nullptr; // current run (needed to detect run changes for loading CCDB parameters) + int fCurrentRun = 0; // current run (needed to detect run changes for loading CCDB parameters) std::map> fNAssocsInBunch; // key: track global index, value: vector of global index for events associated in-bunch (events that have in-bunch pileup or splitting) std::map> fNAssocsOutOfBunch; // key: track global index, value: vector of global index for events associated out-of-bunch (events that have no in-bunch pileup) @@ -939,8 +939,8 @@ struct AnalysisPrefilterSelection { std::map fPrefilterMap; AnalysisCompositeCut* fPairCut = nullptr; - uint32_t fPrefilterMask = nullptr; - int fPrefilterCutBit = nullptr; + uint32_t fPrefilterMask = 0; + int fPrefilterCutBit = 0; Preslice trackAssocsPerCollision = aod::track_association::collisionId; @@ -1206,14 +1206,14 @@ struct AnalysisSameEventPairing { std::vector fMCGenAccCuts; bool fUseMCGenAccCut = false; - uint32_t fTrackFilterMask = nullptr; // mask for the track cuts required in this task to be applied on the barrel cuts produced upstream - uint32_t fMuonFilterMask = nullptr; // mask for the muon cuts required in this task to be applied on the muon cuts produced upstream - int fNCutsBarrel = nullptr; - int fNCutsMuon = nullptr; - int fNPairCuts = nullptr; + uint32_t fTrackFilterMask = 0; // mask for the track cuts required in this task to be applied on the barrel cuts produced upstream + uint32_t fMuonFilterMask = 0; // mask for the muon cuts required in this task to be applied on the muon cuts produced upstream + int fNCutsBarrel = 0; + int fNCutsMuon = 0; + int fNPairCuts = 0; bool fHasTwoProngGenMCsignals = false; - bool fEnableBarrelHistos = nullptr; + bool fEnableBarrelHistos = false; // bool fEnableMuonHistos; Preslice> trackAssocsPerCollision = aod::track_association::collisionId; @@ -2337,13 +2337,13 @@ struct AnalysisDileptonTrack { Configurable fConfigMCGenSignalHadronJSON{"cfgMCGenSignalHadronJSON", "", "generator level hadron signal (JSON format), used for MC level combinatorics"}; } fConfigMCOptions; - int fCurrentRun = nullptr; // needed to detect if the run changed and trigger update of calibrations etc. - int fNCuts = nullptr; - int fNLegCuts = nullptr; - int fNPairCuts = nullptr; - int fNCommonTrackCuts = nullptr; + int fCurrentRun = 0; // needed to detect if the run changed and trigger update of calibrations etc. + int fNCuts = 0; + int fNLegCuts = 0; + int fNPairCuts = 0; + int fNCommonTrackCuts = 0; std::map fCommonTrackCutMap; - uint32_t fTrackCutBitMap = nullptr; // track cut bit mask to be used in the selection of tracks associated with dileptons + uint32_t fTrackCutBitMap = 0; // track cut bit mask to be used in the selection of tracks associated with dileptons // vector for single-lepton and track cut names for easy access when calling FillHistogramList() std::vector fTrackCutNames; std::vector fLegCutNames; @@ -2360,8 +2360,8 @@ struct AnalysisDileptonTrack { // Filter filterMuon = aod::dqanalysisflags::isMuonSelected > static_cast(0); // use two values array to avoid mixing up the quantities - float* fValuesDilepton = nullptr; - float* fValuesHadron = nullptr; + float* fValuesDilepton = 0.0; + float* fValuesHadron = 0.0; HistogramManager* fHistMan = nullptr; std::vector fRecMCSignals; From 2b49184d6c3d617a3937fbf4554317ab52f2414c Mon Sep 17 00:00:00 2001 From: dmallick2 Date: Fri, 31 Jul 2026 21:08:45 +0200 Subject: [PATCH 11/11] PWGDQ:Fix Megalinter related --- PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index eac4b4d5464..d61bf37ea71 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -2360,8 +2360,8 @@ struct AnalysisDileptonTrack { // Filter filterMuon = aod::dqanalysisflags::isMuonSelected > static_cast(0); // use two values array to avoid mixing up the quantities - float* fValuesDilepton = 0.0; - float* fValuesHadron = 0.0; + float* fValuesDilepton = nullptr; + float* fValuesHadron = nullptr; HistogramManager* fHistMan = nullptr; std::vector fRecMCSignals;