From bf22a7e6515a603a659d7b8c52f5f90716abd9d2 Mon Sep 17 00:00:00 2001 From: Daiki Sekihata Date: Wed, 29 Apr 2026 11:39:50 +0200 Subject: [PATCH] [PWGEM/Dilepton] remove unnecessary lines in skimmerOTS.cxx --- PWGEM/Dilepton/DataModel/dileptonTables.h | 56 ++++++++++----------- PWGEM/Dilepton/TableProducer/skimmerOTS.cxx | 48 +++++++++--------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/PWGEM/Dilepton/DataModel/dileptonTables.h b/PWGEM/Dilepton/DataModel/dileptonTables.h index 73196abc058..c574cb3689a 100644 --- a/PWGEM/Dilepton/DataModel/dileptonTables.h +++ b/PWGEM/Dilepton/DataModel/dileptonTables.h @@ -37,33 +37,33 @@ namespace o2::aod { -namespace pwgem::dilepton::swt -{ -enum class swtAliases : int { // software trigger aliases for EM - kHighTrackMult = 0, - kHighFt0cFv0Mult, - kSingleE, - kLMeeIMR, - kLMeeHMR, - kDiElectron, - kSingleMuLow, - kSingleMuHigh, - kDiMuon, - kNaliases -}; - -const std::unordered_map aliasLabels = { - {"fHighTrackMult", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kHighTrackMult)}, - {"fHighFt0cFv0Mult", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kHighFt0cFv0Mult)}, - {"fSingleE", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleE)}, - {"fLMeeIMR", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kLMeeIMR)}, - {"fLMeeHMR", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kLMeeHMR)}, - {"fDiElectron", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kDiElectron)}, - {"fSingleMuLow", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleMuLow)}, - {"fSingleMuHigh", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleMuHigh)}, - {"fDiMuon", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kDiMuon)}, -}; -} // namespace pwgem::dilepton::swt +// namespace pwgem::dilepton::swt +// { +// enum class swtAliases : int { // software trigger aliases for EM +// kHighTrackMult = 0, +// kHighFt0cFv0Mult, +// kSingleE, +// kLMeeIMR, +// kLMeeHMR, +// kDiElectron, +// kSingleMuLow, +// kSingleMuHigh, +// kDiMuon, +// kNaliases +// }; +// +// const std::unordered_map aliasLabels = { +// {"fHighTrackMult", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kHighTrackMult)}, +// {"fHighFt0cFv0Mult", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kHighFt0cFv0Mult)}, +// {"fSingleE", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleE)}, +// {"fLMeeIMR", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kLMeeIMR)}, +// {"fLMeeHMR", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kLMeeHMR)}, +// {"fDiElectron", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kDiElectron)}, +// {"fSingleMuLow", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleMuLow)}, +// {"fSingleMuHigh", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kSingleMuHigh)}, +// {"fDiMuon", static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kDiMuon)}, +// }; +// } // namespace pwgem::dilepton::swt namespace emevsel { @@ -1221,7 +1221,7 @@ using EMPrimaryTrackEMEventIdTMP = EMPrimaryTrackEMEventIdsTMP::iterator; namespace emthinevent { -DECLARE_SOA_COLUMN(EP2, ep2, float); //! +DECLARE_SOA_COLUMN(EP2, ep2, float); //! DECLARE_SOA_COLUMN(Centrality, centrality, float); //! } // namespace emthinevent DECLARE_SOA_TABLE_VERSIONED(EMThinEvents_000, "AOD", "EMTHINEVENT", 0, //! Thin event information table diff --git a/PWGEM/Dilepton/TableProducer/skimmerOTS.cxx b/PWGEM/Dilepton/TableProducer/skimmerOTS.cxx index 0dcca6318c1..49d48358164 100644 --- a/PWGEM/Dilepton/TableProducer/skimmerOTS.cxx +++ b/PWGEM/Dilepton/TableProducer/skimmerOTS.cxx @@ -48,7 +48,7 @@ struct skimmerOTS { // CCDB options Configurable ccdburl{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"}; - Configurable 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! + Configurable cfg_swt_names{"cfg_swt_names", "fLMeeIMR,fLMeeHMR", "comma-separated software trigger names"}; o2::framework::Configurable ccdbPathSoftwareTrigger{"ccdbPathSoftwareTrigger", "EventFiltering/Zorro/", "ccdb path for ZORRO objects"}; Configurable bcMarginForSoftwareTrigger{"bcMarginForSoftwareTrigger", 100, "Number of BCs of margin for software triggers"}; @@ -58,10 +58,10 @@ struct skimmerOTS { Zorro zorro; std::vector mTOIidx; uint64_t mNinspectedTVX{0}; - std::vector mScalers; - std::vector mSelections; - std::vector mTOICounters; - std::vector mATCounters; + // std::vector mScalers; + // std::vector mSelections; + // std::vector mTOICounters; + // std::vector mATCounters; HistogramRegistry registry{"registry"}; @@ -87,28 +87,28 @@ struct skimmerOTS { hCollisionCounter->GetXaxis()->SetBinLabel(idx + 2, swt_names[idx].data()); } - const int ntrg = static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kNaliases); + // const int ntrg = static_cast(o2::aod::pwgem::dilepton::swt::swtAliases::kNaliases); mNinspectedTVX = 0; - mScalers.resize(ntrg); - mSelections.resize(ntrg); - mTOICounters.resize(ntrg); - mATCounters.resize(ntrg); - for (int idx = 0; idx < ntrg; idx++) { - mTOICounters[idx] = 0; - mATCounters[idx] = 0; - mScalers[idx] = 0; - mSelections[idx] = 0; - } + // mScalers.resize(ntrg); + // mSelections.resize(ntrg); + // mTOICounters.resize(ntrg); + // mATCounters.resize(ntrg); + // for (int idx = 0; idx < ntrg; idx++) { + // // mTOICounters[idx] = 0; + // // mATCounters[idx] = 0; + // // mScalers[idx] = 0; + // // mSelections[idx] = 0; + // } } ~skimmerOTS() { swt_names.clear(); swt_names.shrink_to_fit(); - mTOICounters.clear(); - mTOICounters.shrink_to_fit(); - mATCounters.clear(); - mATCounters.shrink_to_fit(); + // mTOICounters.clear(); + // mTOICounters.shrink_to_fit(); + // mATCounters.clear(); + // mATCounters.shrink_to_fit(); } template @@ -128,10 +128,10 @@ struct skimmerOTS { for (size_t idx = 0; idx < mTOIidx.size(); idx++) { auto swtname = swt_names[idx]; - int emswtId = o2::aod::pwgem::dilepton::swt::aliasLabels.at(swtname); - mScalers[emswtId] = zorro.getScalers()->GetBinContent(mTOIidx[idx] + 2); - mSelections[emswtId] = zorro.getSelections()->GetBinContent(mTOIidx[idx] + 2); - LOGF(info, "Trigger of Interest : index = %d in Zorro, %d in EM, scaler = %llu, selection = %llu", mTOIidx[idx], emswtId, mScalers[emswtId], mSelections[emswtId]); + // int emswtId = o2::aod::pwgem::dilepton::swt::aliasLabels.at(swtname); + uint64_t nScalers = zorro.getScalers()->GetBinContent(mTOIidx[idx] + 2); + uint64_t nSelections = zorro.getSelections()->GetBinContent(mTOIidx[idx] + 2); + LOGF(info, "Trigger of Interest : index = %d in Zorro, scaler = %llu, selection = %llu", mTOIidx[idx], nScalers, nSelections); } mRunNumber = bc.runNumber(); }