Skip to content

Commit 6291294

Browse files
dsekihatdsekihat
authored
[PWGEM/Dilepton] remove unnecessary lines in skimmerOTS.cxx (#16015)
1 parent 0699052 commit 6291294

2 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎PWGEM/Dilepton/DataModel/dileptonTables.h‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -37,33 +37,33 @@
3737
namespace o2::aod
3838
{
3939

40-
namespace pwgem::dilepton::swt
41-
{
42-
enum class swtAliases : int { // software trigger aliases for EM
43-
kHighTrackMult = 0,
44-
kHighFt0cFv0Mult,
45-
kSingleE,
46-
kLMeeIMR,
47-
kLMeeHMR,
48-
kDiElectron,
49-
kSingleMuLow,
50-
kSingleMuHigh,
51-
kDiMuon,
52-
kNaliases
53-
};
54-
55-
const std::unordered_map<std::string, int> aliasLabels = {
56-
{"fHighTrackMult", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kHighTrackMult)},
57-
{"fHighFt0cFv0Mult", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kHighFt0cFv0Mult)},
58-
{"fSingleE", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleE)},
59-
{"fLMeeIMR", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kLMeeIMR)},
60-
{"fLMeeHMR", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kLMeeHMR)},
61-
{"fDiElectron", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kDiElectron)},
62-
{"fSingleMuLow", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleMuLow)},
63-
{"fSingleMuHigh", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleMuHigh)},
64-
{"fDiMuon", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kDiMuon)},
65-
};
66-
} // namespace pwgem::dilepton::swt
40+
// namespace pwgem::dilepton::swt
41+
// {
42+
// enum class swtAliases : int { // software trigger aliases for EM
43+
// kHighTrackMult = 0,
44+
// kHighFt0cFv0Mult,
45+
// kSingleE,
46+
// kLMeeIMR,
47+
// kLMeeHMR,
48+
// kDiElectron,
49+
// kSingleMuLow,
50+
// kSingleMuHigh,
51+
// kDiMuon,
52+
// kNaliases
53+
// };
54+
//
55+
// const std::unordered_map<std::string, int> aliasLabels = {
56+
// {"fHighTrackMult", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kHighTrackMult)},
57+
// {"fHighFt0cFv0Mult", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kHighFt0cFv0Mult)},
58+
// {"fSingleE", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleE)},
59+
// {"fLMeeIMR", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kLMeeIMR)},
60+
// {"fLMeeHMR", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kLMeeHMR)},
61+
// {"fDiElectron", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kDiElectron)},
62+
// {"fSingleMuLow", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleMuLow)},
63+
// {"fSingleMuHigh", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleMuHigh)},
64+
// {"fDiMuon", static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kDiMuon)},
65+
// };
66+
// } // namespace pwgem::dilepton::swt
6767

6868
namespace emevsel
6969
{
@@ -1221,7 +1221,7 @@ using EMPrimaryTrackEMEventIdTMP = EMPrimaryTrackEMEventIdsTMP::iterator;
12211221

12221222
namespace emthinevent
12231223
{
1224-
DECLARE_SOA_COLUMN(EP2, ep2, float); //!
1224+
DECLARE_SOA_COLUMN(EP2, ep2, float); //!
12251225
DECLARE_SOA_COLUMN(Centrality, centrality, float); //!
12261226
} // namespace emthinevent
12271227
DECLARE_SOA_TABLE_VERSIONED(EMThinEvents_000, "AOD", "EMTHINEVENT", 0, //! Thin event information table

‎PWGEM/Dilepton/TableProducer/skimmerOTS.cxx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ struct skimmerOTS {
4848

4949
// CCDB options
5050
Configurable<std::string> ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
51-
Configurable<std::string> cfg_swt_names{"cfg_swt_names", "fLMeeIMR,fLMeeHMR", "comma-separated software trigger names"}; // !trigger names have to be pre-registered in dileptonTable.h for bit operation!
51+
Configurable<std::string> cfg_swt_names{"cfg_swt_names", "fLMeeIMR,fLMeeHMR", "comma-separated software trigger names"};
5252
o2::framework::Configurable<std::string> ccdbPathSoftwareTrigger{"ccdbPathSoftwareTrigger", "EventFiltering/Zorro/", "ccdb path for ZORRO objects"};
5353
Configurable<uint64_t> bcMarginForSoftwareTrigger{"bcMarginForSoftwareTrigger", 100, "Number of BCs of margin for software triggers"};
5454

@@ -58,10 +58,10 @@ struct skimmerOTS {
5858
Zorro zorro;
5959
std::vector<int> mTOIidx;
6060
uint64_t mNinspectedTVX{0};
61-
std::vector<uint64_t> mScalers;
62-
std::vector<uint64_t> mSelections;
63-
std::vector<int> mTOICounters;
64-
std::vector<int> mATCounters;
61+
// std::vector<uint64_t> mScalers;
62+
// std::vector<uint64_t> mSelections;
63+
// std::vector<int> mTOICounters;
64+
// std::vector<int> mATCounters;
6565

6666
HistogramRegistry registry{"registry"};
6767

@@ -87,28 +87,28 @@ struct skimmerOTS {
8787
hCollisionCounter->GetXaxis()->SetBinLabel(idx + 2, swt_names[idx].data());
8888
}
8989

90-
const int ntrg = static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kNaliases);
90+
// const int ntrg = static_cast<int>(o2::aod::pwgem::dilepton::swt::swtAliases::kNaliases);
9191
mNinspectedTVX = 0;
92-
mScalers.resize(ntrg);
93-
mSelections.resize(ntrg);
94-
mTOICounters.resize(ntrg);
95-
mATCounters.resize(ntrg);
96-
for (int idx = 0; idx < ntrg; idx++) {
97-
mTOICounters[idx] = 0;
98-
mATCounters[idx] = 0;
99-
mScalers[idx] = 0;
100-
mSelections[idx] = 0;
101-
}
92+
// mScalers.resize(ntrg);
93+
// mSelections.resize(ntrg);
94+
// mTOICounters.resize(ntrg);
95+
// mATCounters.resize(ntrg);
96+
// for (int idx = 0; idx < ntrg; idx++) {
97+
// // mTOICounters[idx] = 0;
98+
// // mATCounters[idx] = 0;
99+
// // mScalers[idx] = 0;
100+
// // mSelections[idx] = 0;
101+
// }
102102
}
103103

104104
~skimmerOTS()
105105
{
106106
swt_names.clear();
107107
swt_names.shrink_to_fit();
108-
mTOICounters.clear();
109-
mTOICounters.shrink_to_fit();
110-
mATCounters.clear();
111-
mATCounters.shrink_to_fit();
108+
// mTOICounters.clear();
109+
// mTOICounters.shrink_to_fit();
110+
// mATCounters.clear();
111+
// mATCounters.shrink_to_fit();
112112
}
113113

114114
template <typename TBC>
@@ -128,10 +128,10 @@ struct skimmerOTS {
128128

129129
for (size_t idx = 0; idx < mTOIidx.size(); idx++) {
130130
auto swtname = swt_names[idx];
131-
int emswtId = o2::aod::pwgem::dilepton::swt::aliasLabels.at(swtname);
132-
mScalers[emswtId] = zorro.getScalers()->GetBinContent(mTOIidx[idx] + 2);
133-
mSelections[emswtId] = zorro.getSelections()->GetBinContent(mTOIidx[idx] + 2);
134-
LOGF(info, "Trigger of Interest : index = %d in Zorro, %d in EM, scaler = %llu, selection = %llu", mTOIidx[idx], emswtId, mScalers[emswtId], mSelections[emswtId]);
131+
// int emswtId = o2::aod::pwgem::dilepton::swt::aliasLabels.at(swtname);
132+
uint64_t nScalers = zorro.getScalers()->GetBinContent(mTOIidx[idx] + 2);
133+
uint64_t nSelections = zorro.getSelections()->GetBinContent(mTOIidx[idx] + 2);
134+
LOGF(info, "Trigger of Interest : index = %d in Zorro, scaler = %llu, selection = %llu", mTOIidx[idx], nScalers, nSelections);
135135
}
136136
mRunNumber = bc.runNumber();
137137
}

0 commit comments

Comments
 (0)