Skip to content

Commit d8d68aa

Browse files
axti98axti98
authored
[PWGDQ] Change type of cut lists to AnalysisCut* (#18715)
1 parent c05fca3 commit d8d68aa

7 files changed

Lines changed: 47 additions & 47 deletions

‎PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,9 @@ struct TableMakerMC {
264264
o2::parameters::GRPObject* fGrpMagRun2 = nullptr; // for run 2, we access the GRPObject from GLO/GRP/GRP
265265
o2::parameters::GRPMagField* fGrpMag = nullptr; // for run 3, we access GRPMagField from GLO/Config/GRPMagField
266266

267-
AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
268-
std::vector<AnalysisCompositeCut*> fTrackCuts; //! Barrel track cuts
269-
std::vector<AnalysisCompositeCut*> fMuonCuts; //! Muon track cuts
267+
AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
268+
std::vector<AnalysisCut*> fTrackCuts; //! Barrel track cuts
269+
std::vector<AnalysisCut*> fMuonCuts; //! Muon track cuts
270270

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

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

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,10 @@ struct TableMaker {
336336
o2::parameters::GRPObject* fGrpMagRun2 = nullptr; // for run 2, we access the GRPObject from GLO/GRP/GRP
337337
o2::parameters::GRPMagField* fGrpMag = nullptr; // for run 3, we access GRPMagField from GLO/Config/GRPMagField
338338

339-
AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
340-
std::vector<AnalysisCompositeCut*> fTrackCuts; //! Barrel track cuts
341-
std::vector<AnalysisCompositeCut*> fMuonCuts; //! Muon track cuts
342-
std::vector<AnalysisCompositeCut*> fEMCalCuts; //! EMCal cluster cuts
339+
AnalysisCompositeCut* fEventCut = nullptr; //! Event selection cut
340+
std::vector<AnalysisCut*> fTrackCuts; //! Barrel track cuts
341+
std::vector<AnalysisCut*> fMuonCuts; //! Muon track cuts
342+
std::vector<AnalysisCut*> fEMCalCuts; //! EMCal cluster cuts
343343

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

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

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

‎PWGDQ/Tasks/dqEfficiency_withAssoc.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ struct AnalysisTrackSelection {
676676
Service<o2::ccdb::BasicCCDBManager> fCCDB{};
677677

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

10131013
HistogramManager* fHistMan = nullptr;
1014-
std::vector<AnalysisCompositeCut*> fMuonCuts;
1014+
std::vector<AnalysisCut*> fMuonCuts;
10151015
std::vector<TString> fHistNamesReco;
10161016
std::vector<TString> fHistNamesMCMatched;
10171017
std::vector<MCSignal*> fMCSignals; // list of signals to be checked
@@ -1041,7 +1041,7 @@ struct AnalysisMuonSelection {
10411041
if (addCutsStr != "") {
10421042
std::vector<AnalysisCut*> addCuts = dqcuts::GetCutsFromJSON(addCutsStr.Data());
10431043
for (auto const& t : addCuts) {
1044-
fMuonCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
1044+
fMuonCuts.push_back(t);
10451045
}
10461046
}
10471047
VarManager::SetUseVars(AnalysisCut::fgUsedVars); // provide the list of required variables so that VarManager knows what to fill

‎PWGDQ/Tasks/dqEfficiency_withAssoc_direct.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ struct AnalysisTrackSelection {
609609
Service<o2::pid::tof::TOFResponse> fTofResponse{};
610610

611611
HistogramManager* fHistMan = nullptr;
612-
std::vector<AnalysisCompositeCut*> fTrackCuts;
612+
std::vector<AnalysisCut*> fTrackCuts;
613613
std::vector<MCSignal*> fMCSignals; // list of signals to be checked
614614
std::vector<TString> fHistNamesReco;
615615
std::vector<TString> fHistNamesMCMatched;
@@ -640,7 +640,7 @@ struct AnalysisTrackSelection {
640640
if (addTrackCutsStr != "") {
641641
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
642642
for (const auto& t : addTrackCuts) {
643-
fTrackCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
643+
fTrackCuts.push_back(t);
644644
}
645645
}
646646
VarManager::SetUseVars(AnalysisCut::fgUsedVars); // provide the list of required variables so that VarManager knows what to fill

‎PWGDQ/Tasks/dqEnergyCorrelator_direct.cxx‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ struct AnalysisEnergyCorrelator {
155155
MixingHandler* fMixHandler = nullptr;
156156

157157
AnalysisCompositeCut* fEventCut = nullptr;
158-
std::vector<AnalysisCompositeCut*> fTrackCuts; // Electron cuts
159-
std::vector<AnalysisCompositeCut*> fHadronCuts; // Hadron cuts
158+
std::vector<AnalysisCut*> fTrackCuts; // Electron cuts
159+
std::vector<AnalysisCut*> fHadronCuts; // Hadron cuts
160160

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

185-
TH2F* hAcceptance_rec;
186-
TH2F* hAcceptance_gen;
187-
TH2F* hEfficiency_dilepton;
188-
TH2F* hEfficiency_hadron;
189-
TH1F* hMasswindow;
190-
TH2F* hReweighthadron;
185+
TH2F* hAcceptance_rec = nullptr;
186+
TH2F* hAcceptance_gen = nullptr;
187+
TH2F* hEfficiency_dilepton = nullptr;
188+
TH2F* hEfficiency_hadron = nullptr;
189+
TH1F* hMasswindow = nullptr;
190+
TH2F* hReweighthadron = nullptr;
191191

192192
void init(o2::framework::InitContext& context)
193193
{
@@ -240,7 +240,7 @@ struct AnalysisEnergyCorrelator {
240240
if (trackCutsJSON != "") {
241241
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(trackCutsJSON.Data());
242242
for (auto& t : addTrackCuts) {
243-
fTrackCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
243+
fTrackCuts.push_back(t);
244244
fTrackCutNames.push_back(t->GetName());
245245
trackCutStr += Form(",%s", t->GetName());
246246
}
@@ -313,7 +313,7 @@ struct AnalysisEnergyCorrelator {
313313
if (hadronCutsJSON != "") {
314314
std::vector<AnalysisCut*> addHadronCuts = dqcuts::GetCutsFromJSON(hadronCutsJSON.Data());
315315
for (auto& t : addHadronCuts) {
316-
fHadronCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
316+
fHadronCuts.push_back(t);
317317
fHadronCutNames.push_back(t->GetName());
318318
hadronCutStr += Form(",%s", t->GetName());
319319
}
@@ -651,26 +651,26 @@ struct AnalysisEnergyCorrelator {
651651
VarManager::FillPair<TPairType, TTrackFillMap>(t1, t2);
652652
VarManager::FillPairVertexing<TPairType, gkEventFillMapWithMults, TTrackFillMap>(event, t1, t2, VarManager::fgValues);
653653

654-
if (sign1 * sign2 < 0) { // +- pairs
655-
fHistMan->FillHistClass(histNames[iEleCut][0].Data(), VarManager::fgValues); // reconstructed, unmatched
656-
for (size_t isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
657-
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
658-
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + isig][0].Data(), VarManager::fgValues); // matched signal
654+
if (sign1 * sign2 < 0) { // +- pairs
655+
fHistMan->FillHistClass(histNames[iEleCut][0].Data(), VarManager::fgValues); // reconstructed, unmatched
656+
for (size_t mcRecSignal = 0; mcRecSignal < fRecMCSignals.size(); mcRecSignal++) { // loop over MC signals
657+
if (mcDecision & (static_cast<uint32_t>(1) << mcRecSignal)) {
658+
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + mcRecSignal][0].Data(), VarManager::fgValues); // matched signal
659659
}
660660
}
661661
} else {
662662
if (sign1 > 0) { // ++ pairs
663663
fHistMan->FillHistClass(histNames[iEleCut][1].Data(), VarManager::fgValues);
664-
for (size_t isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
665-
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
666-
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + isig][1].Data(), VarManager::fgValues);
664+
for (size_t mcRecSignal = 0; mcRecSignal < fRecMCSignals.size(); mcRecSignal++) { // loop over MC signals
665+
if (mcDecision & (static_cast<uint32_t>(1) << mcRecSignal)) {
666+
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + mcRecSignal][1].Data(), VarManager::fgValues);
667667
}
668668
}
669669
} else { // -- pairs
670670
fHistMan->FillHistClass(histNames[iEleCut][2].Data(), VarManager::fgValues);
671-
for (unsigned int isig = 0; isig < fRecMCSignals.size(); isig++) { // loop over MC signals
672-
if (mcDecision & (static_cast<uint32_t>(1) << isig)) {
673-
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + isig][2].Data(), VarManager::fgValues);
671+
for (unsigned int mcRecSignal = 0; mcRecSignal < fRecMCSignals.size(); mcRecSignal++) { // loop over MC signals
672+
if (mcDecision & (static_cast<uint32_t>(1) << mcRecSignal)) {
673+
fHistMan->FillHistClass(histNamesMC[iEleCut * fRecMCSignals.size() + mcRecSignal][2].Data(), VarManager::fgValues);
674674
}
675675
}
676676
}

‎PWGDQ/Tasks/tableReader_withAssoc.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ struct AnalysisTrackSelection {
823823
o2::ccdb::CcdbApi fCCDBApi;
824824

825825
HistogramManager* fHistMan = nullptr;
826-
std::vector<AnalysisCompositeCut*> fTrackCuts;
826+
std::vector<AnalysisCut*> fTrackCuts;
827827

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

@@ -851,7 +851,7 @@ struct AnalysisTrackSelection {
851851
if (addTrackCutsStr != "") {
852852
std::vector<AnalysisCut*> addTrackCuts = o2::aod::dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
853853
for (auto const& t : addTrackCuts) {
854-
fTrackCuts.push_back(reinterpret_cast<AnalysisCompositeCut*>(t));
854+
fTrackCuts.push_back(t);
855855
}
856856
}
857857

@@ -1105,7 +1105,7 @@ struct AnalysisMuonSelection {
11051105
o2::framework::Service<o2::ccdb::BasicCCDBManager> fCCDB{};
11061106

11071107
HistogramManager* fHistMan = nullptr;
1108-
std::vector<AnalysisCompositeCut*> fMuonCuts;
1108+
std::vector<AnalysisCut*> fMuonCuts;
11091109

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

@@ -1132,7 +1132,7 @@ struct AnalysisMuonSelection {
11321132
if (addCutsStr != "") {
11331133
std::vector<AnalysisCut*> addCuts = o2::aod::dqcuts::GetCutsFromJSON(addCutsStr.Data());
11341134
for (auto const& t : addCuts) {
1135-
fMuonCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
1135+
fMuonCuts.push_back(t);
11361136
}
11371137
}
11381138

‎PWGDQ/Tasks/tableReader_withAssoc_direct.cxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ struct AnalysisTrackSelection {
675675
Service<o2::pid::tof::TOFResponse> fTofResponse{};
676676

677677
HistogramManager* fHistMan = nullptr;
678-
std::vector<AnalysisCompositeCut*> fTrackCuts;
678+
std::vector<AnalysisCut*> fTrackCuts;
679679
std::vector<TString> fHistNamesReco;
680680

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

@@ -1119,7 +1119,7 @@ struct AnalysisMuonSelection {
11191119
Service<o2::ccdb::BasicCCDBManager> fCCDB{};
11201120

11211121
HistogramManager* fHistMan = nullptr;
1122-
std::vector<AnalysisCompositeCut*> fMuonCuts;
1122+
std::vector<AnalysisCut*> fMuonCuts;
11231123

11241124
int fCurrentRun = 0;
11251125

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

0 commit comments

Comments
 (0)