Skip to content

Commit 955e5e2

Browse files
committed
PWGDQ: Add MC truth information and configurable tag
1 parent 6665737 commit 955e5e2

2 files changed

Lines changed: 59 additions & 60 deletions

File tree

PWGDQ/Core/HistogramsLibrary.cxx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,20 +1269,19 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
12691269
hm->AddHistogram(histClass, "Mass_Pt_cosThetaRM_Tauxy", "", 4, varspTRM.data(), bins.data(), xmin.data(), xmax.data(), nullptr, -1, kFALSE);
12701270
}
12711271
if (groupStr.CompareTo("polarization-dielectron-pbpb-midy-he-gen") == 0) {
1272-
std::array<int, 5> varspTHE = {VarManager::kMCMass, VarManager::kMCPt,VarManager::kMCEventCentrFT0C, VarManager::kMCCosThetaHE,VarManager::kMCPhiHE};
1272+
std::array<int, 5> varspTHE = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCEventCentrFT0C, VarManager::kMCCosThetaHE, VarManager::kMCPhiHE};
12731273
std::array<int, 5> bins = {50, 30, 10, 20, 10};
1274-
std::array<double, 5> xmin = {2., 0.,0, -1., 0.0};
1275-
std::array<double, 5> xmax = {4., 3.,100, 1., 6.28};
1274+
std::array<double, 5> xmin = {2., 0., 0, -1., 0.0};
1275+
std::array<double, 5> xmax = {4., 3., 100, 1., 6.28};
12761276
hm->AddHistogram(histClass, "MC_Dielectron_Mass_Pt_Cent_cosThetaHE", "", 5, varspTHE.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE);
1277-
1278-
}
1277+
}
12791278
if (groupStr.CompareTo("polarization-dielectron-pbpb-midy-cs-gen") == 0) {
1280-
std::array<int, 5> varspTCS = {VarManager::kMCMass, VarManager::kMCPt,VarManager::kMCEventCentrFT0C, VarManager::kMCCosThetaCS,VarManager::kMCPhiCS};
1279+
std::array<int, 5> varspTCS = {VarManager::kMCMass, VarManager::kMCPt, VarManager::kMCEventCentrFT0C, VarManager::kMCCosThetaCS, VarManager::kMCPhiCS};
12811280
std::array<int, 5> bins = {50, 30, 10, 20, 10};
1282-
std::array<double, 5> xmin = {2., 0.,0, -1., 0.0};
1283-
std::array<double, 5> xmax = {4., 3.,100, 1., 6.28};
1281+
std::array<double, 5> xmin = {2., 0., 0, -1., 0.0};
1282+
std::array<double, 5> xmax = {4., 3., 100, 1., 6.28};
12841283
hm->AddHistogram(histClass, "MC_Dielectron_Mass_Pt_Cent_cosThetaCS", "", 5, varspTCS.data(), bins.data(), xmin.data(), xmax.data(), 0, -1, kFALSE);
1285-
}
1284+
}
12861285
if (groupStr.CompareTo("pair") == 0) {
12871286
if (subGroupStr.Contains("cepf")) {
12881287
hm->AddHistogram(histClass, "Mass", "", false, 300, 0.0, 12.0, VarManager::kMass);

PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,39 +1500,39 @@ struct AnalysisSameEventPairing {
15001500

15011501
for (auto& sig : fGenMCSignals) {
15021502
if (sig->GetNProngs() == 1) {
1503-
histNames += Form("MCTruthGen_%s;", sig->GetName()); // TODO: Add these names to a std::vector to avoid using Form in the process function
1503+
histNames += Form("MCTruthGen_%s;", sig->GetName()); // TODO: Add these names to a std::vector to avoid using Form in the process function
15041504
histNames += Form("MCTruthGenSel_%s;", sig->GetName());
15051505
} else if (sig->GetNProngs() == 2) {
1506-
if (fConfigOptions.fConfigMCtruthQA.value) {
1507-
histNames += Form("MCTruthGenPairSel_%s;", sig->GetName()); // after event selection
1508-
}
1509-
if (fConfigOptions.fConfigPseudoQA.value) {
1506+
if (fConfigOptions.fConfigMCtruthQA.value) {
1507+
histNames += Form("MCTruthGenPairSel_%s;", sig->GetName()); // after event selection
1508+
}
1509+
if (fConfigOptions.fConfigPseudoQA.value) {
1510+
histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName());
1511+
}
1512+
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
15101513
histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName());
1511-
}
1512-
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
1513-
histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName());
1514-
}
1515-
if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) {
1516-
histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName());
1517-
}
1518-
fHasTwoProngGenMCsignals = true;
1514+
}
1515+
if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) {
1516+
histNames += Form("MCTruthGenPseudoPolPairSel_%s;", sig->GetName());
1517+
}
1518+
fHasTwoProngGenMCsignals = true;
15191519
}
15201520
// for these pair level signals, also add histograms for each MCgenAcc cut if specified
15211521
if (fUseMCGenAccCut) {
15221522
for (auto& cut : fMCGenAccCuts) {
1523-
if (fConfigOptions.fConfigMCtruthQA.value) {
1524-
histNames += Form("MCTruthGenPairSel_%s_%s;", sig->GetName(), cut->GetName()); // after event selection and MCgenAcc cut
1525-
}
1526-
if (fConfigOptions.fConfigPseudoQA.value) {
1523+
if (fConfigOptions.fConfigMCtruthQA.value) {
1524+
histNames += Form("MCTruthGenPairSel_%s_%s;", sig->GetName(), cut->GetName()); // after event selection and MCgenAcc cut
1525+
}
1526+
if (fConfigOptions.fConfigPseudoQA.value) {
15271527
histNames += Form("MCTruthGenPseudoPolPairSel_%s_%s;", sig->GetName(), cut->GetName());
1528-
}
1529-
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
1530-
histNames += Form("MCTruthGenPoldielectronPbPbPairHESel_%s;", sig->GetName(), cut->GetName());
1531-
}
1532-
if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) {
1533-
histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName());
1534-
}
1535-
}
1528+
}
1529+
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
1530+
histNames += Form("MCTruthGenPoldielectronPbPbPairHESel_%s;", sig->GetName(), cut->GetName());
1531+
}
1532+
if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) {
1533+
histNames += Form("MCTruthGenPseudoPolPairCSSel_%s_%s;", sig->GetName(), cut->GetName());
1534+
}
1535+
}
15361536
}
15371537
}
15381538

@@ -2186,35 +2186,35 @@ struct AnalysisSameEventPairing {
21862186
VarManager::FillTrackCollisionMC<TPairType>(motherMCParticle_t1, collVtxPos, pdgDB->Mass(motherMCParticle_t1.pdgCode()));
21872187
}
21882188
}
2189-
if (fConfigOptions.fConfigMCtruthQA.value) {
2190-
fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s", sig->GetName()), VarManager::fgValues);
2191-
}
2192-
if (fConfigOptions.fConfigPseudoQA.value) {
2189+
if (fConfigOptions.fConfigMCtruthQA.value) {
2190+
fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s", sig->GetName()), VarManager::fgValues);
2191+
}
2192+
if (fConfigOptions.fConfigPseudoQA.value) {
21932193
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairSel_%s", sig->GetName()), VarManager::fgValues);
21942194
}
2195-
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
2196-
fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName()), VarManager::fgValues);
2197-
}
2198-
if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) {
2199-
fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairCSSel_%s", sig->GetName()), VarManager::fgValues);
2200-
}
2201-
2202-
if (fUseMCGenAccCut) {
2195+
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
2196+
fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName()), VarManager::fgValues);
2197+
}
2198+
if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) {
2199+
fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairCSSel_%s", sig->GetName()), VarManager::fgValues);
2200+
}
2201+
2202+
if (fUseMCGenAccCut) {
22032203
for (auto& cut : fMCGenAccCuts) {
22042204
if (cut->IsSelected(VarManager::fgValues)) {
2205-
if (fConfigOptions.fConfigMCtruthQA.value) {
2206-
fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2207-
}
2208-
if (fConfigOptions.fConfigPseudoQA.value) {
2209-
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues); }
2210-
2211-
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
2212-
fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2213-
2214-
}
2215-
if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) {
2216-
fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairCSSel_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2217-
}
2205+
if (fConfigOptions.fConfigMCtruthQA.value) {
2206+
fHistMan->FillHistClass(Form("MCTruthGenPairSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2207+
}
2208+
if (fConfigOptions.fConfigPseudoQA.value) {
2209+
fHistMan->FillHistClass(Form("MCTruthGenPseudoPolPairSel_%s_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2210+
}
2211+
2212+
if (fConfigOptions.fConfigTruthPbPbMIDYHE.value) {
2213+
fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairHESel_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2214+
}
2215+
if (fConfigOptions.fConfigTruthPbPbMIDYCS.value) {
2216+
fHistMan->FillHistClass(Form("MCTruthGenPoldielectronPbPbPairCSSel_%s", sig->GetName(), cut->GetName()), VarManager::fgValues);
2217+
}
22182218
}
22192219
}
22202220
}
@@ -3221,7 +3221,7 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses, const char
32213221
if (classStr.Contains("MCTruthGenPoldielectronPbPbPairHE")) {
32223222
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-dielectron-pbpb-midy-he-gen", histName);
32233223
}
3224-
3224+
32253225
if (classStr.Contains("MCTruthGenPoldielectronPbPbPairCS")) {
32263226
dqhistograms::DefineHistograms(histMan, objArray->At(iclass)->GetName(), "polarization-dielectron-pbpb-midy-cs-gen", histName);
32273227
}

0 commit comments

Comments
 (0)