Skip to content

[PWGDQ] Using info from dalitz selected tracks in dqEfficiency_withAssoc_direct.cxx #17629

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

Open
glegras wants to merge 6 commits into
base: master
Choose a base branch
from
+391 −293
Open

[PWGDQ] Using info from dalitz selected tracks in dqEfficiency_withAssoc_direct.cxx #17629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f30bca7
using info from dalitz selected tracks in dqEfficiency_withAssoc_dir…
glegras Aug 27, 2026
9cadd28
fix megalinter
glegras Aug 27, 2026
10bb454
more linter errors fixed
glegras Aug 27, 2026
a4cd01d
clang-format
glegras Aug 27, 2026
3f6619a
clang format, again
glegras Aug 27, 2026
c661260
local clang format did not work correctly
glegras Aug 27, 2026
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
32 changes: 9 additions & 23 deletions PWGDQ/Core/CutsLibrary.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,13 +541,6 @@
return cut;
}

if (nameStr == "JpsiPWGSkimmedCuts1") { // please do not remove or modify, this is used for the common Skimmed tree production, (Xiaozhi Bai)
cut->AddCut(GetAnalysisCut("jpsiKineSkimmed"));
cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed"));
cut->AddCut(GetAnalysisCut("electronPIDLooseSkimmed"));
return cut;
}

if (nameStr == "JpsiPWGSkimmedCuts2") {
cut->AddCut(GetAnalysisCut("jpsiKineSkimmed"));
cut->AddCut(GetAnalysisCut("electronTrackQualitySkimmed"));
Expand Down Expand Up @@ -4278,7 +4271,7 @@
return cut;
}

if (nameStr == "eventStandardSel8PbPbQualityTightTrackOccupancyCollInTime") {
if (nameStr == "eventStandardSel8PbPbQualityTightTrackOccupancyCollInTime2") {
cut->AddCut(VarManager::kVtxZ, -10.0, 10.0);
cut->AddCut(VarManager::kIsSel8, 0.5, 1.5);
cut->AddCut(VarManager::kIsNoTFBorder, 0.5, 1.5);
Expand Down Expand Up @@ -4672,12 +4665,6 @@
return cut;
}

if (nameStr == "jpsiKineSkimmed") {
cut->AddCut(VarManager::kPt, 0.7, 1000.0);
cut->AddCut(VarManager::kEta, -0.9, 0.9);
return cut;
}

if (nameStr == "lmeePrefilterKine") {
cut->AddCut(VarManager::kPt, 0., 20.0);
cut->AddCut(VarManager::kEta, -1.2, 1.2);
Expand Down Expand Up @@ -5471,7 +5458,7 @@

for (int i = 1; i <= 8; i++) { // o2-linter: disable=magic-number (number of cuts)
if (nameStr == Form("dalitzLeg%d", i)) {
cut->AddCut(VarManager::kIsDalitzLeg + i - 1, 0.5, 1.5);
cut->AddCut(VarManager::kIsDalitzLeg + i - 1, -0.5, 0.5, true);

@iarsene iarsene Sep 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be dangerous, since the order of the variables in the VarManager is not protected by any mechanism

@glegras glegras Sep 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure I understand why it is dangerous. The reson for this change was a bug introduced in the VarManager when Maurice solved some linter errors, for which this variable is not necessarily 1 but can be 2^i. But I can also correct it in the VarManager if necessary

return cut;
}

Expand All @@ -5482,17 +5469,17 @@
}

if (nameStr == "pidcalib_ele") {
cut->AddCut(VarManager::kIsLegFromGamma, 0.5, 1.5, false);
cut->AddCut(VarManager::kIsLegFromGamma, -0.5, 0.5, true);
return cut;
}

if (nameStr == "pidcalib_pion") {
cut->AddCut(VarManager::kIsLegFromK0S, 0.5, 1.5, false);
cut->AddCut(VarManager::kIsLegFromK0S, -0.5, 0.5, true);
return cut;
}

if (nameStr == "pidcalib_proton") {
cut->AddCut(VarManager::kIsProtonFromLambdaAndAntiLambda, 0.5, 1.5, false);
cut->AddCut(VarManager::kIsProtonFromLambdaAndAntiLambda, -0.5, 0.5, true);
return cut;
}

Expand Down Expand Up @@ -5999,7 +5986,7 @@
if (icase == 0) {
cut->AddCut(VarManager::kTPCnSigmaEl, -4., 4., false, VarManager::kPin, 0.0, 1e+10, false);
cut->AddCut(VarManager::kTPCnSigmaPi, -99., 2.5, true, VarManager::kPin, 0.0, 1e+10, false);
} else if (icase == 1 || icase == 2) {

Check failure on line 5989 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number] 

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
cut->AddCut(VarManager::kTPCnSigmaEl_Corr, -4., 4., false, VarManager::kPin, 0.0, 1e+10, false);
cut->AddCut(VarManager::kTPCnSigmaPi_Corr, -99., 2.5, true, VarManager::kPin, 0.0, 1e+10, false);
}
Expand Down Expand Up @@ -7937,9 +7924,7 @@
}
}

if (!cutDirsFilled) {
cutDirsFilled = true;
}
cutDirsFilled = true;

centBins.emplace_back(centMin, centMax);
ptBins.emplace_back(ptMin, ptMax);
Expand Down Expand Up @@ -7988,9 +7973,10 @@
binaryCfg.cutsMl = makeLabeledCutsMl(cutsMl, labelsFlatBin, labelsClass);

return binaryCfg;
}

// MultiClass
} else if (typeStr == "MultiClass") {
// MultiClass
if (typeStr == "MultiClass") {
dqmlcuts::MultiClassBdtScoreConfig multiCfg;
multiCfg.inputFeatures = namesInputFeatures;
multiCfg.onnxFiles = onnxFileNames;
Expand Down
84 changes: 64 additions & 20 deletions PWGDQ/Core/MCSignalLibrary.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,18 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)
signal = new MCSignal(name, "Electrons from pi0 decays", {prong}, {-1});
return signal;
}
if (nameStr == "ePrimaryFromPi0") {
MCProng prong(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
signal = new MCSignal(name, "Electrons from primary pi0 decays", {prong}, {-1});
return signal;
}
if (nameStr == "eSecondaryFromPi0") {
MCProng prong(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary, true);
signal = new MCSignal(name, "Electrons from secondary pi0 decays", {prong}, {-1});
return signal;
}
Comment on lines +525 to +536

@iarsene iarsene Sep 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure I fully understand these signals. I think that the decay products of primary pi0's are considered ALICE primary particles. Then, the secondary electron signal is for when you have secondary neutral pions (created from some long lived particle or from material)?

@glegras glegras Sep 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, this is indeed to separate primary electrons from the e from pi0 from strange particle decays to check whether they have an influence in the ITS-TPC matching efficiency or not

if (nameStr == "ePrimaryFromPromptPi0") {
MCProng prong(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502, 402}, {true, true});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
Expand All @@ -533,6 +545,18 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)
signal = new MCSignal(name, "Electrons from eta decays", {prong}, {-1});
return signal;
}
if (nameStr == "ePrimaryFromEta") {
MCProng prong(2, {11, 221}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
signal = new MCSignal(name, "Electrons from primary eta decays", {prong}, {-1});
return signal;
}
if (nameStr == "eSecondaryFromEta") {
MCProng prong(2, {11, 221}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary, true);
signal = new MCSignal(name, "Electrons from secondary eta decays", {prong}, {-1});
return signal;
}
if (nameStr == "eFromEtaPrime") {
MCProng prong(2, {11, 331}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
signal = new MCSignal(name, "Electrons from eta' decays", {prong}, {-1});
Expand Down Expand Up @@ -885,6 +909,12 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)

//_________________________________________________________________________________________________________________________
// LMEE pair signals for LF, same mother
if (nameStr == "eeDuplicated") { // check whether we have two tracks pointing to the same MC particle
MCProng prong(1, {11}, {true}, {false}, {0}, {0}, {false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
signal = new MCSignal(name, "duplicated electron", {prong, prong}, {0, 0}); // signal at pair level
return signal;
}
Comment on lines +912 to +917

@iarsene iarsene Sep 7, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why is this needed. Don't we have such a signal already ? (i did not check)

@glegras glegras Sep 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not see such signal in the MCSignalLibrary. Maybe I have missed it?

if (nameStr == "eeFromAnything") {
MCProng prong(2, {11, MCProng::kPDGCodeNotAssigned}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
Expand All @@ -897,6 +927,12 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)
signal = new MCSignal(name, "ee pairs from pi0 decays", {prong, prong}, {1, 1}); // signal at pair level
return signal;
}
if (nameStr == "eeSecondaryFromPi0") {
MCProng prong(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary, true);
signal = new MCSignal(name, "ee secondary pairs from pi0 decays", {prong, prong}, {1, 1}); // signal at pair level
return signal;
}
if (nameStr == "eePrimaryFromPromptPi0") {
MCProng prong(2, {11, 111}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false}, false, {502, 402}, {true, true});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
Expand All @@ -909,6 +945,12 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)
signal = new MCSignal(name, "ee pairs from eta decays", {prong, prong}, {1, 1}); // signal at pair level
return signal;
}
if (nameStr == "eeSecondaryFromEta") {
MCProng prong(2, {11, 221}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary, true);
signal = new MCSignal(name, "ee pairs from eta decays", {prong, prong}, {1, 1}); // signal at pair level
return signal;
}
if (nameStr == "eeFromEtaprime") {
MCProng prong(2, {11, 331}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
Expand Down Expand Up @@ -1769,7 +1811,7 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)
signal = new MCSignal(name, "Jpsi from Chic2 decays", {prong}, {1});
return signal;
}
if (nameStr == "JpsiFromChic2") {
if (nameStr == "JpsiFromChic") {
MCProng prong(2, {443, 904}, {true, true}, {false, false}, {0, 0}, {0, 0}, {false, false});
prong.SetSourceBit(0, MCProng::kPhysicalPrimary);
signal = new MCSignal(name, "Jpsi from Chic0, Chic1 or Chic2 decays", {prong}, {1});
Expand Down Expand Up @@ -2038,6 +2080,8 @@ MCSignal* o2::aod::dqmcsignals::GetMCSignal(const char* name)
signal = new MCSignal(name, "anyprimary and electron pair from non-prompt jpsi", {pronge, pronge, prongPrimary}, {1, 1, -1});
return signal;
}

LOGF(warn, "Did not find MC signal %s", nameStr);
return nullptr;
}

Expand Down Expand Up @@ -2080,10 +2124,10 @@ std::vector<MCSignal*> o2::aod::dqmcsignals::GetMCSignalsFromJSON(const char* js
if (!ValidateJSONMCSignal(&signal, sigName)) {
LOG(fatal) << "MCSignal JSON not properly defined for " << sigName << ". Skipping";
continue;
} else {
LOG(debug) << "MCSignal validated";
}

LOG(debug) << "MCSignal validated";

// Get the signal title
const char* title = (signal.HasMember("title") ? signal.FindMember("title")->value.GetString() : "");
LOG(info) << "Title is: " << title;
Expand Down Expand Up @@ -2121,7 +2165,7 @@ std::vector<MCSignal*> o2::aod::dqmcsignals::GetMCSignalsFromJSON(const char* js
// Get the common ancestors array
std::vector<int8_t> commonAncestors;
if (signal.HasMember("commonAncestors")) {
for (auto& v : signal.FindMember("commonAncestors")->value.GetArray()) {
for (const auto& v : signal.FindMember("commonAncestors")->value.GetArray()) {
commonAncestors.push_back(v.GetInt());
LOG(debug) << "common ancestor " << v.GetInt();
}
Expand All @@ -2131,7 +2175,7 @@ std::vector<MCSignal*> o2::aod::dqmcsignals::GetMCSignalsFromJSON(const char* js
}
}

if (prongs.size() == 0) {
if (prongs.empty()) {
LOG(fatal) << "No prongs were defined for this MCSignal!";
return signals;
}
Expand Down Expand Up @@ -2196,13 +2240,13 @@ bool o2::aod::dqmcsignals::ValidateJSONMCProng(T prongJSON, const char* prongNam
return false;
}
std::vector<uint32_t> nSourceBits;
for (auto& ii : prongJSON->FindMember("sourceBits")->value.GetArray()) {
for (const auto& ii : prongJSON->FindMember("sourceBits")->value.GetArray()) {
if (!ii.IsArray()) {
LOG(fatal) << "The sourceBits field should be an array of arrays of MCProng::Source";
return false;
}
nSourceBits.push_back(ii.GetArray().Size());
for (auto& iii : ii.GetArray()) {
for (const auto& iii : ii.GetArray()) {
if (MCProng::fgSourceNames.find(iii.GetString()) == MCProng::fgSourceNames.end()) {
LOG(fatal) << "Source " << iii.GetString() << " not implemented in MCProng";
return false;
Expand All @@ -2215,7 +2259,7 @@ bool o2::aod::dqmcsignals::ValidateJSONMCProng(T prongJSON, const char* prongNam
return false;
}
int iElem = 0;
for (auto& ii : prongJSON->FindMember("excludeSource")->value.GetArray()) {
for (const auto& ii : prongJSON->FindMember("excludeSource")->value.GetArray()) {
if (!ii.IsArray()) {
LOG(fatal) << "The excludeSource field should be an array of arrays of bool";
return false;
Expand Down Expand Up @@ -2293,21 +2337,21 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
LOG(debug) << "n: " << n;
// Get the array of PDG codes
std::vector<int> pdgs;
for (auto& pdg : prongJSON->FindMember("pdgs")->value.GetArray()) {
for (const auto& pdg : prongJSON->FindMember("pdgs")->value.GetArray()) {
pdgs.push_back(pdg.GetInt());
LOG(debug) << "pdgs: " << pdg.GetInt();
}
// get the array of booleans for check both charges option
std::vector<bool> checkBothCharges;
for (auto& ii : prongJSON->FindMember("checkBothCharges")->value.GetArray()) {
for (const auto& ii : prongJSON->FindMember("checkBothCharges")->value.GetArray()) {
checkBothCharges.push_back(ii.GetBool());
LOG(debug) << "check both charges " << ii.GetBool();
}

// get the array of booleans for the excludePDG option, defaults to false
std::vector<bool> excludePDG;
if (prongJSON->HasMember("excludePDG")) {
for (auto& ii : prongJSON->FindMember("excludePDG")->value.GetArray()) {
for (const auto& ii : prongJSON->FindMember("excludePDG")->value.GetArray()) {
excludePDG.push_back(ii.GetBool());
LOG(debug) << "exclude pdg " << ii.GetBool();
}
Expand All @@ -2320,9 +2364,9 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
// get the source bits, and transform from string to int
std::vector<std::vector<int>> sourceBitsVec;
if (prongJSON->HasMember("sourceBits")) {
for (auto& ii : prongJSON->FindMember("sourceBits")->value.GetArray()) {
for (const auto& ii : prongJSON->FindMember("sourceBits")->value.GetArray()) {
std::vector<int> sourceBits;
for (auto& iii : ii.GetArray()) {
for (const auto& iii : ii.GetArray()) {
sourceBits.push_back(MCProng::fgSourceNames[iii.GetString()]);
LOG(debug) << "source bit " << iii.GetString();
}
Expand All @@ -2332,9 +2376,9 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
// prepare the exclusion source options if specified
std::vector<std::vector<bool>> excludeSourceVec;
if (prongJSON->HasMember("excludeSource")) {
for (auto& ii : prongJSON->FindMember("excludeSource")->value.GetArray()) {
for (const auto& ii : prongJSON->FindMember("excludeSource")->value.GetArray()) {
std::vector<bool> excludeSource;
for (auto& iii : ii.GetArray()) {
for (const auto& iii : ii.GetArray()) {
excludeSource.push_back(iii.GetBool());
LOG(debug) << "exclude source bit " << iii.GetBool();
}
Expand All @@ -2345,7 +2389,7 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
// prepare the useANDonSourceBitMap vector, defaults to true for each generation
std::vector<bool> useANDonSourceBitMap;
if (prongJSON->HasMember("useANDonSourceBitMap")) {
for (auto& ii : prongJSON->FindMember("useANDonSourceBitMap")->value.GetArray()) {
for (const auto& ii : prongJSON->FindMember("useANDonSourceBitMap")->value.GetArray()) {
useANDonSourceBitMap.push_back(ii.GetBool());
LOG(debug) << "use AND on source map " << ii.GetBool();
}
Expand All @@ -2360,12 +2404,12 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa
int igen = 0;
std::vector<uint64_t> sBitsVec;
std::vector<uint64_t> sBitsExcludeVec;
for (auto& itgen : sourceBitsVec) {
for (const auto& itgen : sourceBitsVec) {
int is = 0;
uint64_t sBits = 0;
uint64_t sBitsExclude = 0;
auto excludeVec = (hasExclude ? excludeSourceVec[igen] : std::vector<bool>{});
for (auto& s : itgen) {
for (const auto& s : itgen) {
bool exclude = (hasExclude ? excludeVec[is] : false);
if (s != MCProng::kNothing) {
sBits |= (static_cast<uint64_t>(1) << s);
Expand Down Expand Up @@ -2414,15 +2458,15 @@ MCProng* o2::aod::dqmcsignals::ParseJSONMCProng(T prongJSON, const char* prongNa

std::vector<int> checkIfPDGInHistory = {};
if (prongJSON->HasMember("checkIfPDGInHistory")) {
for (auto& ii : prongJSON->FindMember("checkIfPDGInHistory")->value.GetArray()) {
for (const auto& ii : prongJSON->FindMember("checkIfPDGInHistory")->value.GetArray()) {
checkIfPDGInHistory.push_back(ii.GetInt());
LOG(debug) << "checkIfPDGInHistory: " << ii.GetInt();
}
}

std::vector<bool> excludePDGInHistory = {};
if (prongJSON->HasMember("excludePDGInHistory")) {
for (auto& ii : prongJSON->FindMember("excludePDGInHistory")->value.GetArray()) {
for (const auto& ii : prongJSON->FindMember("excludePDGInHistory")->value.GetArray()) {
excludePDGInHistory.push_back(ii.GetBool());
LOG(debug) << "excludePDGInHistory: " << ii.GetBool();
}
Expand Down
Loading
Loading