Skip to content

PWGDQ: fixing the issue with the dqEfficiency histograms filling #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iarsene merged 1 commit into from
Jun 1, 2022
Merged

PWGDQ: fixing the issue with the dqEfficiency histograms filling #815

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 54 additions & 44 deletions PWGDQ/Tasks/dqEfficiency.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ struct AnalysisTrackSelection {

void init(o2::framework::InitContext&)
{
// Setting the cut names
TString cutNamesStr = fConfigCuts.value;
if (!cutNamesStr.IsNull()) {
std::unique_ptr<TObjArray> objArray(cutNamesStr.Tokenize(","));
Expand All @@ -179,6 +180,17 @@ struct AnalysisTrackSelection {
TString configSigNamesStr = fConfigMCSignals.value;
std::unique_ptr<TObjArray> sigNamesArray(configSigNamesStr.Tokenize(","));

// Setting the MC signal names
for (int isig = 0; isig < sigNamesArray->GetEntries(); ++isig) {
MCSignal* sig = o2::aod::dqmcsignals::GetMCSignal(sigNamesArray->At(isig)->GetName());
if (sig) {
if (sig->GetNProngs() != 1) { // NOTE: only 1 prong signals
continue;
}
fMCSignals.push_back(*sig);
}
}

// Configure histogram classes for each track cut;
// Add histogram classes for each track cut and for each requested MC signal (reconstructed tracks with MC truth)
TString histClasses = "TrackBarrel_BeforeCuts;";
Expand All @@ -187,17 +199,11 @@ struct AnalysisTrackSelection {
fHistNamesReco.push_back(nameStr);
histClasses += Form("%s;", nameStr.Data());
std::vector<TString> mcnames;
for (int isig = 0; isig < sigNamesArray->GetEntries(); ++isig) {
MCSignal* sig = o2::aod::dqmcsignals::GetMCSignal(sigNamesArray->At(isig)->GetName());
if (sig) {
if (sig->GetNProngs() != 1) { // NOTE: only 1 prong signals
continue;
}
fMCSignals.push_back(*sig);
TString nameStr2 = Form("TrackBarrel_%s_%s", cut.GetName(), sigNamesArray->At(isig)->GetName());
mcnames.push_back(nameStr2);
histClasses += Form("%s;", nameStr2.Data());
}
for (auto& sig : fMCSignals) {
TString nameStr2 = Form("TrackBarrel_%s_%s", cut.GetName(), sig.GetName());
printf("Adding my histogram class %s\n", nameStr2.Data());
mcnames.push_back(nameStr2);
histClasses += Form("%s;", nameStr2.Data());
}
fHistNamesMCMatched.push_back(mcnames);
}
Expand Down Expand Up @@ -321,6 +327,7 @@ struct AnalysisMuonSelection {

void init(o2::framework::InitContext&)
{
// Setting the cut names
TString cutNamesStr = fConfigCuts.value;
if (!cutNamesStr.IsNull()) {
std::unique_ptr<TObjArray> objArray(cutNamesStr.Tokenize(","));
Expand All @@ -333,6 +340,17 @@ struct AnalysisMuonSelection {
TString configSigNamesStr = fConfigMCSignals.value;
std::unique_ptr<TObjArray> sigNamesArray(configSigNamesStr.Tokenize(","));

// Setting the MC signal names
for (int isig = 0; isig < sigNamesArray->GetEntries(); ++isig) {
MCSignal* sig = o2::aod::dqmcsignals::GetMCSignal(sigNamesArray->At(isig)->GetName());
if (sig) {
if (sig->GetNProngs() != 1) { // NOTE: only 1 prong signals
continue;
}
fMCSignals.push_back(*sig);
}
}

// Configure histogram classes for each track cut;
// Add histogram classes for each track cut and for each requested MC signal (reconstructed tracks with MC truth)
TString histClasses = "Muon_BeforeCuts;";
Expand All @@ -341,17 +359,11 @@ struct AnalysisMuonSelection {
fHistNamesReco.push_back(nameStr);
histClasses += Form("%s;", nameStr.Data());
std::vector<TString> mcnames;
for (int isig = 0; isig < sigNamesArray->GetEntries(); ++isig) {
MCSignal* sig = o2::aod::dqmcsignals::GetMCSignal(sigNamesArray->At(isig)->GetName());
if (sig) {
if (sig->GetNProngs() != 1) { // NOTE: only 1 prong signals
continue;
}
fMCSignals.push_back(*sig);
TString nameStr2 = Form("Muon_%s_%s;", cut.GetName(), sigNamesArray->At(isig)->GetName());
mcnames.push_back(nameStr2);
histClasses += Form("%s;", nameStr2.Data());
}
for (auto& sig : fMCSignals) {
TString nameStr2 = Form("TrackBarrel_%s_%s", cut.GetName(), sig.GetName());
printf("Adding my histogram class %s\n", nameStr2.Data());
mcnames.push_back(nameStr2);
histClasses += Form("%s;", nameStr2.Data());
}
fHistNamesMCMatched.push_back(mcnames);
}
Expand Down Expand Up @@ -510,6 +522,18 @@ struct AnalysisSameEventPairing {
TString sigNamesStr = fConfigMCRecSignals.value;
std::unique_ptr<TObjArray> objRecSigArray(sigNamesStr.Tokenize(","));
TString histNames = "";

// Setting the MC rec signal names
for (int isig = 0; isig < objRecSigArray->GetEntries(); ++isig) {
MCSignal* sig = o2::aod::dqmcsignals::GetMCSignal(objRecSigArray->At(isig)->GetName());
if (sig) {
if (sig->GetNProngs() != 2) { // NOTE: 2-prong signals required
continue;
}
fRecMCSignals.push_back(*sig);
}
}

if (enableBarrelHistos) {
TString cutNames = fConfigTrackCuts.value;
if (!cutNames.IsNull()) {
Expand All @@ -523,17 +547,10 @@ struct AnalysisSameEventPairing {
fBarrelHistNames.push_back(names);
std::vector<TString> mcSigClasses;
if (!sigNamesStr.IsNull()) {
for (int isig = 0; isig < objRecSigArray->GetEntries(); ++isig) {
MCSignal* sig = o2::aod::dqmcsignals::GetMCSignal(objRecSigArray->At(isig)->GetName());
if (sig) {
if (sig->GetNProngs() != 2) { // NOTE: 2-prong signals required
continue;
}
fRecMCSignals.push_back(*sig);
TString histName = Form("PairsBarrelSEPM_%s_%s", objArray->At(icut)->GetName(), sig->GetName());
histNames += Form("%s;", histName.Data());
mcSigClasses.push_back(histName);
}
for (auto& sig : fRecMCSignals) {
TString histName = Form("PairsBarrelSEPM_%s_%s", objArray->At(icut)->GetName(), sig.GetName());
histNames += Form("%s;", histName.Data());
mcSigClasses.push_back(histName);
} // end loop over MC signals
}
fBarrelHistNamesMCmatched.push_back(mcSigClasses);
Expand All @@ -555,17 +572,10 @@ struct AnalysisSameEventPairing {
fMuonHistNames.push_back(names);
std::vector<TString> mcSigClasses;
if (!sigNamesStr.IsNull()) {
for (int isig = 0; isig < objRecSigArray->GetEntries(); ++isig) {
MCSignal* sig = o2::aod::dqmcsignals::GetMCSignal(objRecSigArray->At(isig)->GetName());
if (sig) {
if (sig->GetNProngs() != 2) { // NOTE: 2-prong signals required
continue;
}
fRecMCSignals.push_back(*sig);
TString histName = Form("PairsMuonSEPM_%s_%s", objArray->At(icut)->GetName(), sig->GetName());
histNames += Form("%s;", histName.Data());
mcSigClasses.push_back(histName);
}
for (auto& sig : fRecMCSignals) {
TString histName = Form("PairsMuonSEPM_%s_%s", objArray->At(icut)->GetName(), sig.GetName());
histNames += Form("%s;", histName.Data());
mcSigClasses.push_back(histName);
} // end loop over MC signals
}
fMuonHistNamesMCmatched.push_back(mcSigClasses);
Expand Down