Skip to content

Commit 2002149

Browse files
alibuildalibuild
committed
Please consider the following formatting changes
1 parent 63b62cd commit 2002149

File tree

1 file changed

+27
-28
lines changed

1 file changed

+27
-28
lines changed

‎PWGDQ/Tasks/filterPPwithAssociation.cxx‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ enum DQTriggers {
6868
kSingleMuLow,
6969
kSingleMuHigh,
7070
kDiMuon,
71-
// kElectronMuon, //the ElectronMuon trigger is not available now
71+
// kElectronMuon, //the ElectronMuon trigger is not available now
7272
kNTriggersDQ
7373
};
7474
} // namespace
@@ -89,8 +89,8 @@ DECLARE_SOA_INDEX_COLUMN(FwdTrack, fwdtrack); //! FwdTrack index
8989
DECLARE_SOA_TABLE(DQEventCuts, "AOD", "DQEVENTCUTS", dqppfilter::IsDQEventSelected);
9090
DECLARE_SOA_TABLE(DQBarrelTrackCuts, "AOD", "DQBARRELCUTS", dqppfilter::IsDQBarrelSelected);
9191
DECLARE_SOA_TABLE(DQMuonsCuts, "AOD", "DQMUONCUTS", dqppfilter::IsDQMuonSelected);
92-
DECLARE_SOA_TABLE(DQEMuBarrelTrackCuts, "AOD", "DQEMUBARRELCUTS", dqppfilter::IsDQEMuBarrelSelected); //for electron-muon pair
93-
DECLARE_SOA_TABLE(DQEMuMuonsCuts, "AOD", "DQEMUMUONCUTS", dqppfilter::IsDQEMuMuonSelected); //for electron-muon pair
92+
DECLARE_SOA_TABLE(DQEMuBarrelTrackCuts, "AOD", "DQEMUBARRELCUTS", dqppfilter::IsDQEMuBarrelSelected); // for electron-muon pair
93+
DECLARE_SOA_TABLE(DQEMuMuonsCuts, "AOD", "DQEMUMUONCUTS", dqppfilter::IsDQEMuMuonSelected); // for electron-muon pair
9494
} // namespace o2::aod
9595

9696
using MyEvents = soa::Join<aod::Collisions, aod::EvSels>;
@@ -323,10 +323,10 @@ struct DQBarrelTrackSelection {
323323
}
324324
int j = 0;
325325
for (auto cut = fEMuTrackCuts.begin(); cut != fEMuTrackCuts.end(); ++cut, ++j) {
326-
if ((*cut).IsSelected(VarManager::fgValues)) {
327-
filterMapEMu |= (uint32_t(1) << j);
328-
}
326+
if ((*cut).IsSelected(VarManager::fgValues)) {
327+
filterMapEMu |= (uint32_t(1) << j);
329328
}
329+
}
330330
trackSel(filterMap);
331331
emuSel(filterMapEMu);
332332
} // end loop over tracks
@@ -580,17 +580,16 @@ struct DQFilterPPTask {
580580
int fNElectronMuonCuts; // number of electron-muon selections
581581
std::vector<bool> fBarrelRunPairing; // bit map on whether the selections require pairing (barrel)
582582
std::vector<bool> fMuonRunPairing; // bit map on whether the selections require pairing (muon)
583-
std::vector<bool> fElectronMuonRunPairing; //bit map on whether the selections require pairing (e-mu)
583+
std::vector<bool> fElectronMuonRunPairing; // bit map on whether the selections require pairing (e-mu)
584584
std::vector<int> fBarrelNreqObjs; // minimal number of tracks/pairs required (barrel)
585585
std::vector<int> fMuonNreqObjs; // minimal number of tracks/pairs required (muon)
586-
std::vector<int> fElectronMuonNreqObjs; //minimal number of electron-muon pairs required
586+
std::vector<int> fElectronMuonNreqObjs; // minimal number of electron-muon pairs required
587587
std::map<int, AnalysisCompositeCut> fBarrelPairCuts; // map of barrel pair cuts
588588
std::map<int, AnalysisCompositeCut> fMuonPairCuts; // map of muon pair cuts
589-
std::map<int, AnalysisCompositeCut> fElectronMuonPairCuts; //map of electron-muon pair cuts
589+
std::map<int, AnalysisCompositeCut> fElectronMuonPairCuts; // map of electron-muon pair cuts
590590
std::map<int, TString> fBarrelPairHistNames; // map with names of the barrel pairing histogram directories
591591
std::map<int, TString> fMuonPairHistNames; // map with names of the muon pairing histogram directories
592592
std::map<int, TString> fElectronMuonPairHistNames; // map with names of the electron-muon pairing histogram directories
593-
594593

595594
std::map<uint64_t, uint64_t> fFiltersMap; // map of filters for events that passed at least one filter
596595
std::map<uint64_t, std::vector<bool>> fCEFPfilters; // map of CEFP filters for events that passed at least one filter
@@ -641,7 +640,7 @@ struct DQFilterPPTask {
641640
}
642641
}
643642
}
644-
//electron-muon pair
643+
// electron-muon pair
645644
TString electronMuonSelsStr = fConfigElectronMuonSelections.value;
646645
std::unique_ptr<TObjArray> objArray3(electronMuonSelsStr.Tokenize(","));
647646
fNElectronMuonCuts = objArray3->GetEntries();
@@ -890,9 +889,9 @@ struct DQFilterPPTask {
890889
}
891890
}
892891

893-
//electron-muon pair
892+
// electron-muon pair
894893
std::vector<int> objCountersElectronMuon(fNElectronMuonCuts, 0); // init all counters to zero
895-
pairingMask = 0; // reset the mask for the e-mu
894+
pairingMask = 0; // reset the mask for the e-mu
896895
for (auto& [trackAssoc, muon] : combinations(barrelAssocs, muonAssocs)) {
897896
for (int i = 0; i < fNElectronMuonCuts; ++i) {
898897
if (trackAssoc.isDQEMuBarrelSelected() & muon.isDQEMuMuonSelected() & (uint32_t(1) << i)) {
@@ -1030,13 +1029,13 @@ struct DQFilterPPTask {
10301029
}
10311030
}
10321031
// the ElectronMuon trigger is not available now
1033-
/* for (int i = fNBarrelCuts + fNMuonCuts; i < fNBarrelCuts + fNMuonCuts + fNElectronMuonCuts; i++) {
1034-
if (filter & (uint64_t(1) << i)) {
1035-
if (i < kNTriggersDQ) {
1036-
decisions[i] = true;
1037-
}
1038-
}
1039-
}*/
1032+
/* for (int i = fNBarrelCuts + fNMuonCuts; i < fNBarrelCuts + fNMuonCuts + fNElectronMuonCuts; i++) {
1033+
if (filter & (uint64_t(1) << i)) {
1034+
if (i < kNTriggersDQ) {
1035+
decisions[i] = true;
1036+
}
1037+
}
1038+
}*/
10401039
// if this collision fired at least one input, add it to the map, or if it is there already, update the decisions with a logical OR
10411040
// This may happen in the case when some collisions beyond the iterator are added because they contain ambiguous tracks fired on by another collision
10421041
if (fFiltersMap.find(collision.globalIndex()) == fFiltersMap.end()) {
@@ -1118,26 +1117,26 @@ struct DQFilterPPTask {
11181117
if (!collision.isDQEventSelected()) {
11191118
eventFilter(0);
11201119
dqtable(false, false, false, false, false, false, false);
1121-
// dqtable(false, false, false, false, false, false, false, false); //the ElectronMuon trigger is not available now
1120+
// dqtable(false, false, false, false, false, false, false, false); //the ElectronMuon trigger is not available now
11221121
continue;
11231122
}
11241123
fStats->Fill(-1.0);
11251124

11261125
if (fFiltersMap.find(collision.globalIndex()) == fFiltersMap.end()) {
11271126
eventFilter(0);
11281127
dqtable(false, false, false, false, false, false, false);
1129-
// dqtable(false, false, false, false, false, false, false, false); //the ElectronMuon trigger is not available now
1128+
// dqtable(false, false, false, false, false, false, false, false); //the ElectronMuon trigger is not available now
11301129
} else {
11311130
totalEventsTriggered++;
1132-
for (int i = 0; i < fNBarrelCuts + fNMuonCuts + fNElectronMuonCuts; i++) {
1133-
if (fFiltersMap[collision.globalIndex()] & (uint32_t(1) << i))
1134-
fStats->Fill(static_cast<float>(i));
1135-
}
1136-
}
1131+
for (int i = 0; i < fNBarrelCuts + fNMuonCuts + fNElectronMuonCuts; i++) {
1132+
if (fFiltersMap[collision.globalIndex()] & (uint32_t(1) << i))
1133+
fStats->Fill(static_cast<float>(i));
1134+
}
1135+
}
11371136
eventFilter(fFiltersMap[collision.globalIndex()]);
11381137
auto dqDecisions = fCEFPfilters[collision.globalIndex()];
11391138
dqtable(dqDecisions[0], dqDecisions[1], dqDecisions[2], dqDecisions[3], dqDecisions[4], dqDecisions[5], dqDecisions[6]);
1140-
// dqtable(dqDecisions[0], dqDecisions[1], dqDecisions[2], dqDecisions[3], dqDecisions[4], dqDecisions[5], dqDecisions[6], dqDecisions[7]); //the ElectronMuon trigger is not available now
1139+
// dqtable(dqDecisions[0], dqDecisions[1], dqDecisions[2], dqDecisions[3], dqDecisions[4], dqDecisions[5], dqDecisions[6], dqDecisions[7]); //the ElectronMuon trigger is not available now
11411140
}
11421141
}
11431142

0 commit comments

Comments
 (0)