Skip to content

[PWGDQ] small fixes for dalitz selection #16169

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 2 commits into from
May 8, 2026
+9 −8
Merged

[PWGDQ] small fixes for dalitz selection #16169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2586c7a
small fixes
glegras May 8, 2026
0506e3a
clang format
glegras May 8, 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
17 changes: 9 additions & 8 deletions PWGDQ/Tasks/DalitzSelection.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@
// Configurables
// cuts
struct : ConfigurableGroup {
Configurable<std::string> fConfigEventCuts{"cfgEventCuts", "eventStandardNoINT7", "Event selection"};

Check failure on line 81 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> fConfigDalitzTrackCuts{"cfgDalitzTrackCuts", "", "Dalitz track selection cuts for tag, separated by a comma"};

Check failure on line 82 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> fConfigDalitzTrackCutsProbe{"cfgDalitzTrackCutsProbe", "", "Dalitz track selection cuts for probe, separated by a comma (if empty, use same selections as the tag)"};

Check failure on line 83 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> fConfigDalitzPairCuts{"cfgDalitzPairCuts", "", "Dalitz pair selection cuts"};

Check failure on line 84 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> fConfigTrackCutsJSON{"cfgTrackCutsJSON", "", "Additional list of barrel track cuts in JSON format"};

Check failure on line 85 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> fConfigTrackCutsProbeJSON{"cfgTrackCutsProbeJSON", "", "Additional list of barrel track cuts for the probe in JSON format"};

Check failure on line 86 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<std::string> fConfigPairCutsJSON{"cfgPairCutsJSON", "", "Additional list of barrel track cuts in JSON format"};

Check failure on line 87 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<float> fConfigBarrelTrackPINLow{"cfgBarrelLowPIN", 0.1f, "Low pt cut for Dalitz tracks in the barrel"};

Check failure on line 88 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<float> fConfigEtaCut{"cfgEtaCut", 0.9f, "Eta cut for Dalitz tracks in the barrel"};

Check failure on line 89 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<float> fConfigTPCNSigLow{"cfgTPCNSigElLow", -3.f, "Low TPCNSigEl cut for Dalitz tracks in the barrel"};

Check failure on line 90 in PWGDQ/Tasks/DalitzSelection.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/configurable] 

Use lowerCamelCase for names of configurables and use the same name for the struct member as for the JSON string. (Declare the type and names on the same line.)
Configurable<float> fConfigTPCNSigHigh{"cfgTPCNSigElHigh", 3.f, "High TPCNsigEl cut for Dalitz tracks in the barrel"};
} fConfigCuts;

Expand Down Expand Up @@ -138,6 +138,7 @@
void init(o2::framework::InitContext&)
{
fIsTagAndProbe = false;
VarManager::SetDefaultVarNames();

// Event cuts
fEventCut = new AnalysisCompositeCut(true);
Expand All @@ -158,7 +159,7 @@
if (addTrackCutsStr != "") {
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
for (const auto& t : addTrackCuts) {
fTrackCuts.push_back(reinterpret_cast<AnalysisCompositeCut*>(t));
fTrackCuts.push_back(*dynamic_cast<AnalysisCompositeCut*>(t));
}
}

Expand All @@ -176,7 +177,7 @@
if (addTrackCutsProbeStr != "" && (cutNamesProbeStr.CompareTo(cutNamesStr) != 0 || addTrackCutsProbeStr.CompareTo(addTrackCutsStr) != 0)) {
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsProbeStr.Data());
for (const auto& t : addTrackCuts) {
fTrackCutsProbe.push_back(reinterpret_cast<AnalysisCompositeCut*>(t));
fTrackCutsProbe.push_back(*dynamic_cast<AnalysisCompositeCut*>(t));
}
fIsTagAndProbe = true;
}
Expand All @@ -194,7 +195,7 @@
if (addPairCutsStr != "") {
std::vector<AnalysisCut*> addPairCuts = dqcuts::GetCutsFromJSON(addPairCutsStr.Data());
for (const auto& t : addPairCuts) {
fPairCuts.push_back(reinterpret_cast<AnalysisCompositeCut*>(t));
fPairCuts.push_back(*dynamic_cast<AnalysisCompositeCut*>(t));
}
}

Expand All @@ -212,7 +213,7 @@
}

VarManager::SetUseVars(AnalysisCut::fgUsedVars); // provide the list of required variables so that VarManager knows what to fill
VarManager::SetDefaultVarNames();

fHistMan = new HistogramManager("analysisHistos", "aa", VarManager::kNVars);
fHistMan->SetUseDefaultVariableNames(kTRUE);
fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
Expand All @@ -229,13 +230,13 @@
histClasses += Form("TrackBarrelProbe_%s_%s_%s;", (*trackCut).GetName(), fTrackCutsProbe.at(iCut).GetName(), (*pairCut).GetName());
histClasses += Form("Pair_%s_%s_%s;", (*trackCut).GetName(), fTrackCutsProbe.at(iCut).GetName(), (*pairCut).GetName());
if (fConfigOptions.fConfigEnableLikeSign) {
histClasses += Form("Pair_LS_%s_%s_%s;", (*trackCut).GetName(), fTrackCutsProbe.at(iCut).GetName(), (*pairCut).GetName());
histClasses += Form("PairLS_%s_%s_%s;", (*trackCut).GetName(), fTrackCutsProbe.at(iCut).GetName(), (*pairCut).GetName());
}
} else {
histClasses += Form("TrackBarrel_%s_%s;", (*trackCut).GetName(), (*pairCut).GetName());
histClasses += Form("Pair_%s_%s;", (*trackCut).GetName(), (*pairCut).GetName());
if (fConfigOptions.fConfigEnableLikeSign) {
histClasses += Form("Pair_LS_%s_%s;", (*trackCut).GetName(), (*pairCut).GetName());
histClasses += Form("PairLS_%s_%s;", (*trackCut).GetName(), (*pairCut).GetName());
}
}
}
Expand Down Expand Up @@ -334,7 +335,7 @@
if (!fIsTagAndProbe && track1.globalIndex() >= track2.globalIndex()) {
continue;
}
if (!fConfigOptions.fConfigEnableLikeSign && track1.sign() * track2.sign() > 0) {
if (!fConfigOptions.fConfigEnableLikeSign && (track1.sign() * track2.sign() > 0)) {
continue;
}

Expand Down Expand Up @@ -461,7 +462,7 @@
}

for (const auto& track : tracks) { // Fill dalitz bits
dalitzbits(fDalitzmap[track.globalIndex()]);
dalitzbits(fIsTagAndProbe ? fDalitzmapProbe[track.globalIndex()] : fDalitzmap[track.globalIndex()]);
}
}

Expand Down
Loading