Skip to content

Commit c070902

Browse files
feisenhufeisenhu
committed
[PWGDQ] fix filling of configQA histos
1 parent 7b01379 commit c070902

1 file changed

Lines changed: 27 additions & 33 deletions

File tree

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,26 +1205,22 @@ struct AnalysisSameEventPairing {
12051205
if (!sigNamesStr.IsNull()) {
12061206
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) {
12071207
auto sig = fRecMCSignals.at(isig);
1208+
names = {
1209+
Form("PairsBarrelSEPM_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1210+
Form("PairsBarrelSEPP_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1211+
Form("PairsBarrelSEMM_%s_%s", objArray->At(icut)->GetName(), sig.GetName())};
12081212
if (fConfigQA) {
1209-
names = {
1210-
Form("PairsBarrelSEPM_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1211-
Form("PairsBarrelSEPP_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1212-
Form("PairsBarrelSEMM_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1213-
Form("PairsBarrelSEPMCorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1214-
Form("PairsBarrelSEPMIncorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1215-
Form("PairsBarrelSEPM_ambiguousInBunch_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1216-
Form("PairsBarrelSEPM_ambiguousInBunchCorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1217-
Form("PairsBarrelSEPM_ambiguousInBunchIncorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1218-
Form("PairsBarrelSEPM_ambiguousOutOfBunch_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1219-
Form("PairsBarrelSEPM_ambiguousOutOfBunchCorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1220-
Form("PairsBarrelSEPM_ambiguousOutOfBunchIncorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName())};
1221-
histNames += Form("%s;%s;%s;%s;%s;%s;%s;%s;%s;", names[0].Data(), names[1].Data(), names[2].Data(), names[3].Data(), names[4].Data(), names[5].Data(), names[6].Data(), names[7].Data(), names[8].Data(), names[9].Data(), names[10].Data());
1222-
} else {
1223-
names = {
1224-
Form("PairsBarrelSEPM_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1225-
Form("PairsBarrelSEPP_%s_%s", objArray->At(icut)->GetName(), sig.GetName()),
1226-
Form("PairsBarrelSEMM_%s_%s", objArray->At(icut)->GetName(), sig.GetName())};
1227-
histNames += Form("%s;%s;%s;", names[0].Data(), names[1].Data(), names[2].Data());
1213+
names.push_back(Form("PairsBarrelSEPMCorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()));
1214+
names.push_back(Form("PairsBarrelSEPMIncorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()));
1215+
names.push_back(Form("PairsBarrelSEPM_ambiguousInBunch_%s_%s", objArray->At(icut)->GetName(), sig.GetName()));
1216+
names.push_back(Form("PairsBarrelSEPM_ambiguousInBunchCorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()));
1217+
names.push_back(Form("PairsBarrelSEPM_ambiguousInBunchIncorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()));
1218+
names.push_back(Form("PairsBarrelSEPM_ambiguousOutOfBunch_%s_%s", objArray->At(icut)->GetName(), sig.GetName()));
1219+
names.push_back(Form("PairsBarrelSEPM_ambiguousOutOfBunchCorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()));
1220+
names.push_back(Form("PairsBarrelSEPM_ambiguousOutOfBunchIncorrectAssoc_%s_%s", objArray->At(icut)->GetName(), sig.GetName()));
1221+
}
1222+
for (auto& n : names) {
1223+
histNames += Form("%s;", n.Data());
12281224
}
12291225
fBarrelHistNamesMCmatched.try_emplace(icut * fRecMCSignals.size() + isig, names);
12301226
} // end loop over MC signals
@@ -1583,31 +1579,29 @@ struct AnalysisSameEventPairing {
15831579
fHistMan->FillHistClass(histNames[icut][0].Data(), VarManager::fgValues); // reconstructed, unmatched
15841580
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
15851581
if (mcDecision & (uint32_t(1) << isig)) {
1582+
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][0].Data(), VarManager::fgValues); // matched signal
15861583
if (fConfigQA) {
1587-
fHistMan->FillHistClass(histNamesMC[icut][isig * fRecMCSignals.size()].Data(), VarManager::fgValues); // matched signal
1588-
if (isCorrectAssoc_leg1 && isCorrectAssoc_leg2) { // correct track-collision association
1589-
fHistMan->FillHistClass(histNamesMC[icut][isig * fRecMCSignals.size() + 3].Data(), VarManager::fgValues);
1584+
if (isCorrectAssoc_leg1 && isCorrectAssoc_leg2) { // correct track-collision association
1585+
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][3].Data(), VarManager::fgValues);
15901586
} else { // incorrect track-collision association
1591-
fHistMan->FillHistClass(histNamesMC[icut][isig * fRecMCSignals.size() + 4].Data(), VarManager::fgValues);
1587+
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][4].Data(), VarManager::fgValues);
15921588
}
15931589
if (isAmbiInBunch) { // ambiguous in bunch
1594-
fHistMan->FillHistClass(histNames[icut][isig * fRecMCSignals.size() + 5].Data(), VarManager::fgValues);
1590+
fHistMan->FillHistClass(histNames[icut * fRecMCSignals.size() + isig][5].Data(), VarManager::fgValues);
15951591
if (isCorrectAssoc_leg1 && isCorrectAssoc_leg2) {
1596-
fHistMan->FillHistClass(histNamesMC[icut][isig * fRecMCSignals.size() + 6].Data(), VarManager::fgValues);
1592+
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][6].Data(), VarManager::fgValues);
15971593
} else {
1598-
fHistMan->FillHistClass(histNamesMC[icut][isig * fRecMCSignals.size() + 7].Data(), VarManager::fgValues);
1594+
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][7].Data(), VarManager::fgValues);
15991595
}
16001596
}
16011597
if (isAmbiOutOfBunch) { // ambiguous out of bunch
1602-
fHistMan->FillHistClass(histNames[icut][isig * fRecMCSignals.size() + 8].Data(), VarManager::fgValues);
1598+
fHistMan->FillHistClass(histNames[icut * fRecMCSignals.size() + isig][8].Data(), VarManager::fgValues);
16031599
if (isCorrectAssoc_leg1 && isCorrectAssoc_leg2) {
1604-
fHistMan->FillHistClass(histNamesMC[icut][isig * fRecMCSignals.size() + 9].Data(), VarManager::fgValues);
1600+
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][9].Data(), VarManager::fgValues);
16051601
} else {
1606-
fHistMan->FillHistClass(histNamesMC[icut][isig * fRecMCSignals.size() + 10].Data(), VarManager::fgValues);
1602+
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][10].Data(), VarManager::fgValues);
16071603
}
16081604
}
1609-
} else {
1610-
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][0].Data(), VarManager::fgValues); // matched signal
16111605
}
16121606
}
16131607
}
@@ -1616,7 +1610,7 @@ struct AnalysisSameEventPairing {
16161610
fHistMan->FillHistClass(histNames[icut][1].Data(), VarManager::fgValues);
16171611
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
16181612
if (mcDecision & (uint32_t(1) << isig)) {
1619-
fHistMan->FillHistClass(histNamesMC[icut][isig * fRecMCSignals.size() + 1].Data(), VarManager::fgValues);
1613+
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][1].Data(), VarManager::fgValues);
16201614
}
16211615
}
16221616
if (fConfigQA) {
@@ -1631,7 +1625,7 @@ struct AnalysisSameEventPairing {
16311625
fHistMan->FillHistClass(histNames[icut][2].Data(), VarManager::fgValues);
16321626
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
16331627
if (mcDecision & (uint32_t(1) << isig)) {
1634-
fHistMan->FillHistClass(histNamesMC[icut][isig * fRecMCSignals.size() + 2].Data(), VarManager::fgValues);
1628+
fHistMan->FillHistClass(histNamesMC[icut * fRecMCSignals.size() + isig][2].Data(), VarManager::fgValues);
16351629
}
16361630
}
16371631
if (fConfigQA) {

0 commit comments

Comments
 (0)