Skip to content

[PWGDQ] Change type of cut lists to AnalysisCut* #18715

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
axti98 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[PWGDQ] Change type of cut lists to AnalysisCut* #18715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47077a1
Change type if cut lists from AnalysisCompositeCut to AnalysisCut to …
axti98 Nov 12, 2026
0c764a6
Apply clang-format
axti98 Nov 12, 2026
0848657
Fix MegaLinter error in dqEnergyCorrelator_cirect
axti98 Nov 12, 2026
ee224a7
Change missing muon cut
axti98 Nov 12, 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
10 changes: 5 additions & 5 deletions PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ struct TableMakerMC {
o2::parameters::GRPObject* fGrpMagRun2 = nullptr; // for run 2, we access the GRPObject from GLO/GRP/GRP
o2::parameters::GRPMagField* fGrpMag = nullptr; // for run 3, we access GRPMagField from GLO/Config/GRPMagField

AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
std::vector<AnalysisCompositeCut*> fTrackCuts; //! Barrel track cuts
std::vector<AnalysisCompositeCut*> fMuonCuts; //! Muon track cuts
AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
std::vector<AnalysisCut*> fTrackCuts; //! Barrel track cuts
std::vector<AnalysisCut*> fMuonCuts; //! Muon track cuts

bool fDoDetailedQA = false; // Bool to set detailed QA true, if QA is set true
int fCurrentRun = -1; // needed to detect if the run changed and trigger update of calibrations etc.
Expand Down Expand Up @@ -495,7 +495,7 @@ struct TableMakerMC {
if (addTrackCutsStr != "") {
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
for (const auto& t : addTrackCuts) {
fTrackCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fTrackCuts.push_back(t);
}
}

Expand All @@ -512,7 +512,7 @@ struct TableMakerMC {
if (addMuonCutsStr != "") {
std::vector<AnalysisCut*> addMuonCuts = dqcuts::GetCutsFromJSON(addMuonCutsStr.Data());
for (const auto& t : addMuonCuts) {
fMuonCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fMuonCuts.push_back(t);
}
}

Expand Down
14 changes: 7 additions & 7 deletions PWGDQ/TableProducer/tableMaker_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,10 @@ struct TableMaker {
o2::parameters::GRPObject* fGrpMagRun2 = nullptr; // for run 2, we access the GRPObject from GLO/GRP/GRP
o2::parameters::GRPMagField* fGrpMag = nullptr; // for run 3, we access GRPMagField from GLO/Config/GRPMagField

AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
std::vector<AnalysisCompositeCut*> fTrackCuts; //! Barrel track cuts
std::vector<AnalysisCompositeCut*> fMuonCuts; //! Muon track cuts
std::vector<AnalysisCompositeCut*> fEMCalCuts; //! EMCal cluster cuts
AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
std::vector<AnalysisCut*> fTrackCuts; //! Barrel track cuts
std::vector<AnalysisCut*> fMuonCuts; //! Muon track cuts
std::vector<AnalysisCut*> fEMCalCuts; //! EMCal cluster cuts

bool fDoDetailedQA = false; // Bool to set detailed QA true, if QA is set true
int fCurrentRun = -1; // needed to detect if the run changed and trigger update of calibrations etc.
Expand Down Expand Up @@ -614,7 +614,7 @@ struct TableMaker {
if (addTrackCutsStr != "") {
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
for (const auto& t : addTrackCuts) {
fTrackCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fTrackCuts.push_back(t);
}
}

Expand All @@ -623,7 +623,7 @@ struct TableMaker {
if (addEMCalCutsStr != "") {
std::vector<AnalysisCut*> addEMCalCuts = dqcuts::GetCutsFromJSON(addEMCalCutsStr.Data());
for (const auto& t : addEMCalCuts) {
fEMCalCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fEMCalCuts.push_back(t);
}
}

Expand All @@ -640,7 +640,7 @@ struct TableMaker {
if (addMuonCutsStr != "") {
std::vector<AnalysisCut*> addMuonCuts = dqcuts::GetCutsFromJSON(addMuonCutsStr.Data());
for (const auto& t : addMuonCuts) {
fMuonCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fMuonCuts.push_back(t);
}
}

Expand Down
8 changes: 4 additions & 4 deletions PWGDQ/Tasks/dqEfficiency_withAssoc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ struct AnalysisTrackSelection {
Service<o2::ccdb::BasicCCDBManager> fCCDB{};

HistogramManager* fHistMan = nullptr;
std::vector<AnalysisCompositeCut*> fTrackCuts;
std::vector<AnalysisCut*> fTrackCuts;
std::vector<MCSignal*> fMCSignals; // list of signals to be checked
std::vector<TString> fHistNamesReco;
std::vector<TString> fHistNamesMCMatched;
Expand Down Expand Up @@ -706,7 +706,7 @@ struct AnalysisTrackSelection {
if (addTrackCutsStr != "") {
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
for (auto const& t : addTrackCuts) {
fTrackCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fTrackCuts.push_back(t);
}
}
VarManager::SetUseVars(AnalysisCut::fgUsedVars); // provide the list of required variables so that VarManager knows what to fill
Expand Down Expand Up @@ -1011,7 +1011,7 @@ struct AnalysisMuonSelection {
Service<o2::ccdb::BasicCCDBManager> fCCDB{};

HistogramManager* fHistMan = nullptr;
std::vector<AnalysisCompositeCut*> fMuonCuts;
std::vector<AnalysisCut*> fMuonCuts;
std::vector<TString> fHistNamesReco;
std::vector<TString> fHistNamesMCMatched;
std::vector<MCSignal*> fMCSignals; // list of signals to be checked
Expand Down Expand Up @@ -1041,7 +1041,7 @@ struct AnalysisMuonSelection {
if (addCutsStr != "") {
std::vector<AnalysisCut*> addCuts = dqcuts::GetCutsFromJSON(addCutsStr.Data());
for (auto const& t : addCuts) {
fMuonCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fMuonCuts.push_back(t);
}
}
VarManager::SetUseVars(AnalysisCut::fgUsedVars); // provide the list of required variables so that VarManager knows what to fill
Expand Down
4 changes: 2 additions & 2 deletions PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ struct AnalysisTrackSelection {
Service<o2::pid::tof::TOFResponse> fTofResponse{};

HistogramManager* fHistMan = nullptr;
std::vector<AnalysisCompositeCut*> fTrackCuts;
std::vector<AnalysisCut*> fTrackCuts;
std::vector<MCSignal*> fMCSignals; // list of signals to be checked
std::vector<TString> fHistNamesReco;
std::vector<TString> fHistNamesMCMatched;
Expand Down Expand Up @@ -640,7 +640,7 @@ struct AnalysisTrackSelection {
if (addTrackCutsStr != "") {
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
for (const auto& t : addTrackCuts) {
fTrackCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fTrackCuts.push_back(t);
}
}
VarManager::SetUseVars(AnalysisCut::fgUsedVars); // provide the list of required variables so that VarManager knows what to fill
Expand Down
42 changes: 21 additions & 21 deletions PWGDQ/Tasks/dqEnergyCorrelator_direct.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ struct AnalysisEnergyCorrelator {
MixingHandler* fMixHandler = nullptr;

AnalysisCompositeCut* fEventCut = nullptr;
std::vector<AnalysisCompositeCut*> fTrackCuts; // Electron cuts
std::vector<AnalysisCompositeCut*> fHadronCuts; // Hadron cuts
std::vector<AnalysisCut*> fTrackCuts; // Electron cuts
std::vector<AnalysisCut*> fHadronCuts; // Hadron cuts

std::vector<TString> fTrackCutNames;
std::vector<TString> fHadronCutNames;
Expand All @@ -182,12 +182,12 @@ struct AnalysisEnergyCorrelator {
using MixingBinning = ColumnBinningPolicy<aod::collision::PosZ, aod::mult::MultNTracksPV>;
std::unique_ptr<MixingBinning> fMixingBinning;

TH2F* hAcceptance_rec;
TH2F* hAcceptance_gen;
TH2F* hEfficiency_dilepton;
TH2F* hEfficiency_hadron;
TH1F* hMasswindow;
TH2F* hReweighthadron;
TH2F* hAcceptance_rec = nullptr;
TH2F* hAcceptance_gen = nullptr;
TH2F* hEfficiency_dilepton = nullptr;
TH2F* hEfficiency_hadron = nullptr;
TH1F* hMasswindow = nullptr;
TH2F* hReweighthadron = nullptr;

void init(o2::framework::InitContext& context)
{
Expand Down Expand Up @@ -240,7 +240,7 @@ struct AnalysisEnergyCorrelator {
if (trackCutsJSON != "") {
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(trackCutsJSON.Data());
for (auto& t : addTrackCuts) {
fTrackCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fTrackCuts.push_back(t);
fTrackCutNames.push_back(t->GetName());
trackCutStr += Form(",%s", t->GetName());
}
Expand Down Expand Up @@ -313,7 +313,7 @@ struct AnalysisEnergyCorrelator {
if (hadronCutsJSON != "") {
std::vector<AnalysisCut*> addHadronCuts = dqcuts::GetCutsFromJSON(hadronCutsJSON.Data());
for (auto& t : addHadronCuts) {
fHadronCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fHadronCuts.push_back(t);
fHadronCutNames.push_back(t->GetName());
hadronCutStr += Form(",%s", t->GetName());
}
Expand Down Expand Up @@ -651,26 +651,26 @@ struct AnalysisEnergyCorrelator {
VarManager::FillPair<TPairType, TTrackFillMap>(t1, t2);
VarManager::FillPairVertexing<TPairType, gkEventFillMapWithMults, TTrackFillMap>(event, t1, t2, VarManager::fgValues);

if (sign1 * sign2 < 0) { // +- pairs
fHistMan->FillHistClass(histNames[iEleCut][0].Data(), VarManager::fgValues); // reconstructed, unmatched
for (size_t isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + isig][0].Data(), VarManager::fgValues); // matched signal
if (sign1 * sign2 < 0) { // +- pairs
fHistMan->FillHistClass(histNames[iEleCut][0].Data(), VarManager::fgValues); // reconstructed, unmatched
for (size_t mcRecSignal = 0; mcRecSignal < fRecMCSignals.size(); mcRecSignal++) { // loop over MC signals
if (mcDecision & (static_cast<uint32_t>(1) << mcRecSignal)) {
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + mcRecSignal][0].Data(), VarManager::fgValues); // matched signal
}
}
} else {
if (sign1 > 0) { // ++ pairs
fHistMan->FillHistClass(histNames[iEleCut][1].Data(), VarManager::fgValues);
for (size_t isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + isig][1].Data(), VarManager::fgValues);
for (size_t mcRecSignal = 0; mcRecSignal < fRecMCSignals.size(); mcRecSignal++) { // loop over MC signals
if (mcDecision & (static_cast<uint32_t>(1) << mcRecSignal)) {
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + mcRecSignal][1].Data(), VarManager::fgValues);
}
}
} else { // -- pairs
fHistMan->FillHistClass(histNames[iEleCut][2].Data(), VarManager::fgValues);
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + isig][2].Data(), VarManager::fgValues);
for (unsigned int mcRecSignal = 0; mcRecSignal < fRecMCSignals.size(); mcRecSignal++) { // loop over MC signals
if (mcDecision & (static_cast<uint32_t>(1) << mcRecSignal)) {
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + mcRecSignal][2].Data(), VarManager::fgValues);
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions PWGDQ/Tasks/tableReader_withAssoc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ struct AnalysisTrackSelection {
o2::ccdb::CcdbApi fCCDBApi;

HistogramManager* fHistMan = nullptr;
std::vector<AnalysisCompositeCut*> fTrackCuts;
std::vector<AnalysisCut*> fTrackCuts;

int fCurrentRun = 0; // current run kept to detect run changes and trigger loading params from CCDB

Expand Down Expand Up @@ -831,7 +831,7 @@ struct AnalysisTrackSelection {
if (addTrackCutsStr != "") {
std::vector<AnalysisCut*> addTrackCuts = o2::aod::dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
for (auto const& t : addTrackCuts) {
fTrackCuts.push_back(reinterpret_cast<AnalysisCompositeCut*>(t));
fTrackCuts.push_back(t);
}
}

Expand Down Expand Up @@ -1085,7 +1085,7 @@ struct AnalysisMuonSelection {
o2::framework::Service<o2::ccdb::BasicCCDBManager> fCCDB{};

HistogramManager* fHistMan = nullptr;
std::vector<AnalysisCompositeCut*> fMuonCuts;
std::vector<AnalysisCut*> fMuonCuts;

int fCurrentRun = 0; // current run kept to detect run changes and trigger loading params from CCDB

Expand All @@ -1112,7 +1112,7 @@ struct AnalysisMuonSelection {
if (addCutsStr != "") {
std::vector<AnalysisCut*> addCuts = o2::aod::dqcuts::GetCutsFromJSON(addCutsStr.Data());
for (auto const& t : addCuts) {
fMuonCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fMuonCuts.push_back(t);
}
}

Expand Down
8 changes: 4 additions & 4 deletions PWGDQ/Tasks/tableReader_withAssoc_direct.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ struct AnalysisTrackSelection {
Service<o2::pid::tof::TOFResponse> fTofResponse{};

HistogramManager* fHistMan = nullptr;
std::vector<AnalysisCompositeCut*> fTrackCuts;
std::vector<AnalysisCut*> fTrackCuts;
std::vector<TString> fHistNamesReco;

int fCurrentRun = 0; // current run (needed to detect run changes for loading CCDB parameters)
Expand Down Expand Up @@ -706,7 +706,7 @@ struct AnalysisTrackSelection {
if (addTrackCutsStr != "") {
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
for (auto& t : addTrackCuts) {
fTrackCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fTrackCuts.push_back(t);
}
}

Expand Down Expand Up @@ -1119,7 +1119,7 @@ struct AnalysisMuonSelection {
Service<o2::ccdb::BasicCCDBManager> fCCDB{};

HistogramManager* fHistMan = nullptr;
std::vector<AnalysisCompositeCut*> fMuonCuts;
std::vector<AnalysisCut*> fMuonCuts;

int fCurrentRun = 0;

Expand All @@ -1146,7 +1146,7 @@ struct AnalysisMuonSelection {
if (addCutsStr != "") {
std::vector<AnalysisCut*> addCuts = dqcuts::GetCutsFromJSON(addCutsStr.Data());
for (auto& t : addCuts) {
fMuonCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
fMuonCuts.push_back(t);
}
}

Expand Down
Loading