diff --git a/PWGDQ/Core/HistogramsLibrary.cxx b/PWGDQ/Core/HistogramsLibrary.cxx index 435328304e1..c15894fbb8b 100644 --- a/PWGDQ/Core/HistogramsLibrary.cxx +++ b/PWGDQ/Core/HistogramsLibrary.cxx @@ -1269,20 +1269,19 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h 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) { - std::array varspTHE = {VarManager::kMCMass, VarManager::kMCPt,VarManager::kMCEventCentrFT0C, VarManager::kMCCosThetaHE,VarManager::kMCPhiHE}; + std::array varspTHE = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCEventCentrFT0C, VarManager::kMCCosThetaHE, VarManager::kMCPhiHE}; std::array bins = {50, 30, 10, 20, 10}; - std::array xmin = {2., 0.,0, -1., 0.0}; - std::array xmax = {4., 3.,100, 1., 6.28}; + std::array xmin = {2., 0., 0, -1., 0.0}; + std::array xmax = {4., 3., 100, 1., 6.28}; hm->AddHistogram(histClass, "MC_Dielectron_Mass_Pt_Cent_cosThetaHE", "", 5, varspTHE.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE); - - } + } if (groupStr.CompareTo("polarization-dielectron-pbpb-midy-cs-gen") == 0) { - std::array varspTCS = {VarManager::kMCMass, VarManager::kMCPt,VarManager::kMCEventCentrFT0C, VarManager::kMCCosThetaCS,VarManager::kMCPhiCS}; + std::array varspTCS = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCEventCentrFT0C, VarManager::kMCCosThetaCS, VarManager::kMCPhiCS}; std::array bins = {50, 30, 10, 20, 10}; - std::array xmin = {2., 0.,0, -1., 0.0}; - std::array xmax = {4., 3.,100, 1., 6.28}; + std::array xmin = {2., 0., 0, -1., 0.0}; + std::array xmax = {4., 3., 100, 1., 6.28}; hm->AddHistogram(histClass, "MC_Dielectron_Mass_Pt_Cent_cosThetaCS", "", 5, varspTCS.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE); - } + } if (groupStr.CompareTo("pair") == 0) { if (subGroupStr.Contains("cepf")) { hm->AddHistogram(histClass, "Mass", "", false, 300, 0.0, 12.0, VarManager::kMass); diff --git a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx index 7483b53a272..fccb00a0ff2 100644 --- a/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx +++ b/PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx @@ -1500,39 +1500,39 @@ struct AnalysisSameEventPairing { for (auto& sig : fGenMCSignals) { if (sig->GetNProngs() == 1) { - histNames += Form("MCTruthGen_%s;", sig->GetName()); // TODO: Add these names to a std::vector to avoid using Form in the process function + histNames += Form("MCTruthGen_%s;", sig->GetName()); // TODO: Add these names to a std::vector to avoid using Form in the process function histNames += Form("MCTruthGenSel_%s;", sig->GetName()); } else if (sig->GetNProngs() == 2) { - if (fConfigOptions.fConfigMCtruthQA.value) { - histNames += Form("MCTruthGenPairSel_%s;", sig->GetName()); // after event selection - } - if (fConfigOptions.fConfigPseudoQA.value) { + 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.fConfigTruthPbPbMIDYHE.value) { histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName()); - } - if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { - histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName()); - } - if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { - histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName()); - } - fHasTwoProngGenMCsignals = true; + } + if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { + histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName()); + } + fHasTwoProngGenMCsignals = true; } // for these pair level signals, also add histograms for each MCgenAcc cut if specified if (fUseMCGenAccCut) { for (auto& cut : fMCGenAccCuts) { - if (fConfigOptions.fConfigMCtruthQA.value) { - histNames += Form("MCTruthGenPairSel_%s_%s;", sig->GetName(), cut->GetName()); // after event selection and MCgenAcc cut - } - if (fConfigOptions.fConfigPseudoQA.value) { + 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.fConfigTruthPbPbMIDYHE.value) { - histNames += Form("MCTruthGenPoldielectronPbPbPairHESel_%s;", sig->GetName(), cut->GetName()); - } - if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { - histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); - } - } + } + if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { + histNames += Form("MCTruthGenPoldielectronPbPbPairHESel_%s;", sig->GetName(), cut->GetName()); + } + if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { + histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName()); + } + } } } @@ -2186,35 +2186,35 @@ struct AnalysisSameEventPairing { VarManager::FillTrackCollisionMC(motherMCParticle_t1, collVtxPos, pdgDB->Mass(motherMCParticle_t1.pdgCode())); } } - if (fConfigOptions.fConfigMCtruthQA.value) { - fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s", sig->GetName()), VarManager::fgValues); - } - if (fConfigOptions.fConfigPseudoQA.value) { + 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.fConfigTruthPbPbMIDYHE.value) { - fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName()), VarManager::fgValues); - } - if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { - fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairCSSel_%s", sig->GetName()), VarManager::fgValues); - } - - if (fUseMCGenAccCut) { + if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) { + fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName()), VarManager::fgValues); + } + if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { + fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairCSSel_%s", sig->GetName()), VarManager::fgValues); + } + + if (fUseMCGenAccCut) { for (auto& cut : fMCGenAccCuts) { if (cut->IsSelected(VarManager::fgValues)) { - 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.fConfigTruthPbPbMIDYHE.value) { - fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); - - } - if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { - fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairCSSel_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); - } + 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.fConfigTruthPbPbMIDYHE.value) { + fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); + } + if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) { + fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairCSSel_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); + } } } } @@ -3221,7 +3221,7 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-dielectron-pbpb-midy-he-gen", histName); } - + if (classStr.Contains("MCTruthGenPoldielectronPbPbPairCS")) { dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-dielectron-pbpb-midy-cs-gen", histName); }