Skip to content

Commit e5ae9f4

Browse files
dmallick2dmallick2
committed
PWGDQ: Add and fix configurable options for optimize memory issue
1 parent 32257cb commit e5ae9f4

2 files changed

Lines changed: 58 additions & 16 deletions

File tree

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,15 +1257,25 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
12571257
hm->AddHistogram(histClass, "Coschi", "", false, 25, coschiBins.data(), VarManager::kMCCosChi, 0, nullptr, -1, 0, nullptr, -1, "", "", "", -1, VarManager::kMCWeight);
12581258
}
12591259

1260-
if (groupStr.CompareTo("polarization-pseudoproper-gen") == 0) {
1260+
if (groupStr.CompareTo("polarization-pseudoproper-midy-he-gen") == 0) {
12611261
std::array<int, 4> varspTHE = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaHE, VarManager::kMCVertexingTauxyProjected};
1262-
std::array<int, 4> varspTCS = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCVertexingTauxyProjected};
1263-
std::array<int, 4> varspTRM = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaRM, VarManager::kMCVertexingTauxyProjected};
12641262
std::array<int, 4> bins = {50, 20, 20, 1000};
12651263
std::array<double, 4> xmin = {2., 0., -1., -0.5};
12661264
std::array<double, 4> xmax = {4., 20., 1., 0.5};
12671265
hm->AddHistogram(histClass, "Mass_Pt_cosThetaHE_Tauxy", "", 4, varspTHE.data(), bins.data(), xmin.data(), xmax.data(), nullptr, -1, kFALSE);
1266+
}
1267+
if (groupStr.CompareTo("polarization-pseudoproper-midy-cs-gen") == 0) {
1268+
std::array<int, 4> varspTCS = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaCS, VarManager::kMCVertexingTauxyProjected};
1269+
std::array<int, 4> bins = {50, 20, 20, 1000};
1270+
std::array<double, 4> xmin = {2., 0., -1., -0.5};
1271+
std::array<double, 4> xmax = {4., 20., 1., 0.5};
12681272
hm->AddHistogram(histClass, "Mass_Pt_cosThetaCS_Tauxy", "", 4, varspTCS.data(), bins.data(), xmin.data(), xmax.data(), nullptr, -1, kFALSE);
1273+
}
1274+
if (groupStr.CompareTo("polarization-pseudoproper-midy-rand-gen") == 0) {
1275+
std::array<int, 4> varspTRM = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCCosThetaRM, VarManager::kMCVertexingTauxyProjected};
1276+
std::array<int, 4> bins = {50, 20, 20, 1000};
1277+
std::array<double, 4> xmin = {2., 0., -1., -0.5};
1278+
std::array<double, 4> xmax = {4., 20., 1., 0.5};
12691279
hm->AddHistogram(histClass, "Mass_Pt_cosThetaRM_Tauxy", "", 4, varspTRM.data(), bins.data(), xmin.data(), xmax.data(), nullptr, -1, kFALSE);
12701280
}
12711281
if (groupStr.CompareTo("polarization-dielectron-pbpb-midy-he-gen") == 0) {

‎PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx‎

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,9 @@ struct AnalysisSameEventPairing {
11411141
Configurable<std::string> pair{"cfgPairCuts", "", "Comma separated list of pair cuts, !!! Use only if you know what you are doing, otherwise leave empty"};
11421142
Configurable<bool> fConfigQA{"cfgQA", false, "If true, fill QA histograms"};
11431143
Configurable<bool> fConfigMCtruthQA{"cfgMCtruthQA", false, "If true, fill QA histograms with default"};
1144-
Configurable<bool> fConfigPseudoQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization"};
1144+
Configurable<bool> fConfigPseudoHEQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization HE"};
1145+
Configurable<bool> fConfigPseudoCSQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization CS"};
1146+
Configurable<bool> fConfigPseudoRMQA{"cfgPseudoQA", false, "If true, fill QA histograms with pseudo-proper decay length analysis with polarization RM"};
11451147
Configurable<bool> fConfigTruthPbPbMIDYHE{"cfgTruthPbPbmidyHE", false, "If true, fill QA histograms with dielectron pairs in helicity frame"};
11461148
Configurable<bool> fConfigTruthPbPbMIDYCS{"cfgTruthPbPbmidyCS", false, "If true, fill QA histograms with dielectron pairs in collion-soper frame"};
11471149
Configurable<std::string> fConfigAddSEPHistogram{"cfgAddSEPHistogram", "", "Comma separated list of histograms"};
@@ -1506,14 +1508,20 @@ struct AnalysisSameEventPairing {
15061508
if (fConfigOptions.fConfigMCtruthQA.value) {
15071509
histNames += Form("MCTruthGenPairSel_%s;", sig->GetName()); // after event selection
15081510
}
1509-
if (fConfigOptions.fConfigPseudoQA.value) {
1510-
histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName());
1511+
if (fConfigOptions.fConfigPseudoHEQA.value) {
1512+
histNames += Form("MCTruthGenPseudoPolPairHESel_%s;", sig->GetName());
1513+
}
1514+
if (fConfigOptions.fConfigPseudoCSQA.value) {
1515+
histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName());
1516+
}
1517+
if (fConfigOptions.fConfigPseudoRMQA.value) {
1518+
histNames += Form("MCTruthGenPseudoPolPairRMSel_%s;", sig->GetName());
15111519
}
15121520
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
1513-
histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName());
1521+
histNames += Form("MCTruthGenPoldielectronPbPbPairSel_%s;", sig->GetName());
15141522
}
15151523
if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) {
1516-
histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName());
1524+
histNames += Form("MCTruthGenPseudoPolPairCSSel_%s;", sig->GetName());
15171525
}
15181526
fHasTwoProngGenMCsignals = true;
15191527
}
@@ -1523,8 +1531,14 @@ struct AnalysisSameEventPairing {
15231531
if (fConfigOptions.fConfigMCtruthQA.value) {
15241532
histNames += Form("MCTruthGenPairSel_%s_%s;", sig->GetName(), cut->GetName()); // after event selection and MCgenAcc cut
15251533
}
1526-
if (fConfigOptions.fConfigPseudoQA.value) {
1527-
histNames += Form("MCTruthGenPseudoPolPairSel_%s_%s;", sig->GetName(), cut->GetName());
1534+
if (fConfigOptions.fConfigPseudoHEQA.value) {
1535+
histNames += Form("MCTruthGenPseudoPolPairHESel_%s_%s;", sig->GetName(), cut->GetName());
1536+
}
1537+
if (fConfigOptions.fConfigPseudoCSQA.value) {
1538+
histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName());
1539+
}
1540+
if (fConfigOptions.fConfigPseudoRMQA.value) {
1541+
histNames += Form("MCTruthGenPseudoPolPairRMSel_%s_%s;", sig->GetName(), cut->GetName());
15281542
}
15291543
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
15301544
histNames += Form("MCTruthGenPoldielectronPbPbPairHESel_%s_%s;", sig->GetName(), cut->GetName());
@@ -2189,8 +2203,14 @@ struct AnalysisSameEventPairing {
21892203
if (fConfigOptions.fConfigMCtruthQA.value) {
21902204
fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s", sig->GetName()), VarManager::fgValues);
21912205
}
2192-
if (fConfigOptions.fConfigPseudoQA.value) {
2193-
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairSel_%s", sig->GetName()), VarManager::fgValues);
2206+
if (fConfigOptions.fConfigPseudoHEQA.value) {
2207+
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s", sig->GetName()), VarManager::fgValues);
2208+
}
2209+
if (fConfigOptions.fConfigPseudoCSQA.value) {
2210+
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s", sig->GetName()), VarManager::fgValues);
2211+
}
2212+
if (fConfigOptions.fConfigPseudoRMQA.value) {
2213+
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s", sig->GetName()), VarManager::fgValues);
21942214
}
21952215
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
21962216
fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName()), VarManager::fgValues);
@@ -2205,8 +2225,14 @@ struct AnalysisSameEventPairing {
22052225
if (fConfigOptions.fConfigMCtruthQA.value) {
22062226
fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
22072227
}
2208-
if (fConfigOptions.fConfigPseudoQA.value) {
2209-
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2228+
if (fConfigOptions.fConfigPseudoHEQA.value) {
2229+
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairHESel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2230+
}
2231+
if (fConfigOptions.fConfigPseudoCSQA.value) {
2232+
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairCSSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2233+
}
2234+
if (fConfigOptions.fConfigPseudoRMQA.value) {
2235+
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairRMSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
22102236
}
22112237

22122238
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
@@ -3215,8 +3241,14 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char
32153241
if (classStr.Contains("MCTruthGenPair")) {
32163242
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "mctruth_pair", histName);
32173243
}
3218-
if (classStr.Contains("MCTruthGenPseudoPolPair")) {
3219-
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-gen", histName);
3244+
if (classStr.Contains("MCTruthGenPseudoPolPairHE")) {
3245+
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-he-gen", histName);
3246+
}
3247+
if (classStr.Contains("MCTruthGenPseudoPolPairCS")) {
3248+
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-cs-gen", histName);
3249+
}
3250+
if (classStr.Contains("MCTruthGenPseudoPolPairRM")) {
3251+
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-pseudoproper-midy-rand-gen", histName);
32203252
}
32213253
if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) {
32223254
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-dielectron-pbpb-midy-he-gen", histName);

0 commit comments

Comments
 (0)