From e8289cf444779f9a4bf1db613dc9d74f6056c002 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Thu, 14 Apr 2022 06:39:29 +0200 Subject: [PATCH] Avoid compilation warnings in L1Trigger/L1THGCal --- .../ntuples/L1TriggerNtupleTrackTrigger.cc | 6 +++- .../L1THGCal/interface/HGCalTriggerTools.h | 4 ++- L1Trigger/L1THGCal/src/HGCalTriggerTools.cc | 5 ++- .../test/HGCalTriggerGeomTesterV9Imp2.cc | 32 +++++++++---------- .../test/HGCalTriggerGeomTesterV9Imp3.cc | 32 +++++++++---------- .../plugins/HGCalTriggerValidator.cc | 19 +++++------ 6 files changed, 50 insertions(+), 48 deletions(-) diff --git a/L1Trigger/L1CaloTrigger/test/ntuples/L1TriggerNtupleTrackTrigger.cc b/L1Trigger/L1CaloTrigger/test/ntuples/L1TriggerNtupleTrackTrigger.cc index b3d86161eaa8e..63f7d32c82020 100644 --- a/L1Trigger/L1CaloTrigger/test/ntuples/L1TriggerNtupleTrackTrigger.cc +++ b/L1Trigger/L1CaloTrigger/test/ntuples/L1TriggerNtupleTrackTrigger.cc @@ -16,6 +16,8 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" +#include "Geometry/Records/interface/CaloGeometryRecord.h" +#include "L1Trigger/L1THGCal/interface/HGCalTriggerGeometryBase.h" #include "L1TCaloTriggerNtupleBase.h" @@ -37,6 +39,7 @@ class L1TriggerNtupleTrackTrigger : public L1TCaloTriggerNtupleBase { edm::EDGetTokenT>> track_token_; edm::ESGetToken magf_token; edm::ESGetToken geom_token; + edm::ESGetToken trigGeom_token; int l1track_n_; std::vector l1track_pt_; @@ -68,6 +71,7 @@ void L1TriggerNtupleTrackTrigger::initialize(TTree& tree, collector.consumes>>(conf.getParameter("TTTracks")); magf_token = collector.esConsumes(); geom_token = collector.esConsumes(); + trigGeom_token = collector.esConsumes(); tree.Branch(branch_name_w_prefix("n").c_str(), &l1track_n_, branch_name_w_prefix("n/I").c_str()); tree.Branch(branch_name_w_prefix("pt").c_str(), &l1track_pt_); @@ -98,7 +102,7 @@ void L1TriggerNtupleTrackTrigger::fill(const edm::Event& ev, const edm::EventSet const edm::ESHandle& geomHandle = es.getHandle(geom_token); const TrackerGeometry* tGeom = geomHandle.product(); - triggerTools_.eventSetup(es); + triggerTools_.eventSetup(es, trigGeom_token); clear(); for (auto trackIter = l1TTTrackHandle->begin(); trackIter != l1TTTrackHandle->end(); ++trackIter) { diff --git a/L1Trigger/L1THGCal/interface/HGCalTriggerTools.h b/L1Trigger/L1THGCal/interface/HGCalTriggerTools.h index b677124c2b4ce..ed74c475bc663 100644 --- a/L1Trigger/L1THGCal/interface/HGCalTriggerTools.h +++ b/L1Trigger/L1THGCal/interface/HGCalTriggerTools.h @@ -20,6 +20,8 @@ #include "DataFormats/DetId/interface/DetId.h" #include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" +#include "FWCore/Utilities/interface/ESGetToken.h" +#include "Geometry/Records/interface/CaloGeometryRecord.h" #include "Geometry/HGCalGeometry/interface/HGCalGeometry.h" #include "L1Trigger/L1THGCal/interface/HGCalTriggerGeometryBase.h" @@ -33,7 +35,7 @@ class HGCalTriggerTools { ~HGCalTriggerTools() {} void setGeometry(const HGCalTriggerGeometryBase* const); - void eventSetup(const edm::EventSetup&); // Kept for backward compatibility: used in L1Trigger/L1CaloTrigger/test + void eventSetup(const edm::EventSetup&, const edm::ESGetToken&); // Kept for backward compatibility: used in L1Trigger/L1CaloTrigger/test GlobalPoint getTCPosition(const DetId& id) const; unsigned layers(ForwardSubdetector type) const; unsigned layers(DetId::Detector type) const; diff --git a/L1Trigger/L1THGCal/src/HGCalTriggerTools.cc b/L1Trigger/L1THGCal/src/HGCalTriggerTools.cc index 58cc087664d17..d1c81b8650698 100644 --- a/L1Trigger/L1THGCal/src/HGCalTriggerTools.cc +++ b/L1Trigger/L1THGCal/src/HGCalTriggerTools.cc @@ -31,9 +31,8 @@ namespace { } // namespace // Kept for backward compatibility: used in L1Trigger/L1CaloTrigger/test -void HGCalTriggerTools::eventSetup(const edm::EventSetup& es) { - edm::ESHandle triggerGeometry; - es.get().get(triggerGeometry); +void HGCalTriggerTools::eventSetup(const edm::EventSetup& es, const edm::ESGetToken& token) { + const edm::ESHandle& triggerGeometry = es.getHandle(token); setGeometry(triggerGeometry.product()); } diff --git a/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp2.cc b/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp2.cc index 3aa1f2cf4c5d7..e35ba0ec8dc50 100644 --- a/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp2.cc +++ b/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp2.cc @@ -43,10 +43,11 @@ namespace { class HGCalTriggerGeomTesterV9Imp2 : public edm::stream::EDAnalyzer<> { public: explicit HGCalTriggerGeomTesterV9Imp2(const edm::ParameterSet&); - ~HGCalTriggerGeomTesterV9Imp2(); + ~HGCalTriggerGeomTesterV9Imp2() override = default; - virtual void beginRun(const edm::Run&, const edm::EventSetup&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void beginRun(const edm::Run&, const edm::EventSetup&) override; + void endRun(const edm::Run&, const edm::EventSetup&) override {} + void analyze(const edm::Event&, const edm::EventSetup&) override; private: void fillTriggerGeometry(); @@ -58,8 +59,8 @@ class HGCalTriggerGeomTesterV9Imp2 : public edm::stream::EDAnalyzer<> { void setTreeCellCornerSize(const size_t n); void setTreeTriggerCellNeighborSize(const size_t n); + const edm::ESGetToken triggerGeomToken_; edm::ESHandle triggerGeometry_; - edm::Service fs_; bool no_trigger_; bool no_neighbors_; TTree* treeModules_; @@ -195,12 +196,14 @@ class HGCalTriggerGeomTesterV9Imp2 : public edm::stream::EDAnalyzer<> { /*****************************************************************/ HGCalTriggerGeomTesterV9Imp2::HGCalTriggerGeomTesterV9Imp2(const edm::ParameterSet& conf) - : no_trigger_(false), + : triggerGeomToken_(esConsumes()), + no_trigger_(false), no_neighbors_(false) /*****************************************************************/ { // initialize output trees - treeModules_ = fs_->make("TreeModules", "Tree of all HGC modules"); + edm::Service fs; + treeModules_ = fs->make("TreeModules", "Tree of all HGC modules"); treeModules_->Branch("id", &moduleId_, "id/I"); treeModules_->Branch("zside", &moduleSide_, "zside/I"); treeModules_->Branch("subdet", &moduleSubdet_, "subdet/I"); @@ -261,7 +264,7 @@ HGCalTriggerGeomTesterV9Imp2::HGCalTriggerGeomTesterV9Imp2(const edm::ParameterS treeModules_->Branch("c_y", moduleCell_y_.get(), "c_y[c_n]/F"); treeModules_->Branch("c_z", moduleCell_z_.get(), "c_z[c_n]/F"); // - treeTriggerCells_ = fs_->make("TreeTriggerCells", "Tree of all HGC trigger cells"); + treeTriggerCells_ = fs->make("TreeTriggerCells", "Tree of all HGC trigger cells"); treeTriggerCells_->Branch("id", &triggerCellId_, "id/I"); treeTriggerCells_->Branch("zside", &triggerCellSide_, "zside/I"); treeTriggerCells_->Branch("subdet", &triggerCellSubdet_, "subdet/I"); @@ -323,7 +326,7 @@ HGCalTriggerGeomTesterV9Imp2::HGCalTriggerGeomTesterV9Imp2(const edm::ParameterS treeTriggerCells_->Branch("c_y", triggerCellCell_y_.get(), "c_y[c_n]/F"); treeTriggerCells_->Branch("c_z", triggerCellCell_z_.get(), "c_z[c_n]/F"); // - treeCells_ = fs_->make("TreeCells", "Tree of all HGC cells"); + treeCells_ = fs->make("TreeCells", "Tree of all HGC cells"); treeCells_->Branch("id", &cellId_, "id/I"); treeCells_->Branch("zside", &cellSide_, "zside/I"); treeCells_->Branch("subdet", &cellSubdet_, "subdet/I"); @@ -343,7 +346,7 @@ HGCalTriggerGeomTesterV9Imp2::HGCalTriggerGeomTesterV9Imp2(const edm::ParameterS treeCells_->Branch("corner_y", cellCornersY_.get(), "corner_y[corner_n]/F"); treeCells_->Branch("corner_z", cellCornersZ_.get(), "corner_z[corner_n]/F"); // - treeCellsBH_ = fs_->make("TreeCellsBH", "Tree of all BH cells"); + treeCellsBH_ = fs->make("TreeCellsBH", "Tree of all BH cells"); treeCellsBH_->Branch("id", &cellBHId_, "id/I"); treeCellsBH_->Branch("type", &cellBHType_, "type/I"); treeCellsBH_->Branch("zside", &cellBHSide_, "zside/I"); @@ -365,7 +368,7 @@ HGCalTriggerGeomTesterV9Imp2::HGCalTriggerGeomTesterV9Imp2(const edm::ParameterS treeCellsBH_->Branch("x4", &cellBHX4_, "x4/F"); treeCellsBH_->Branch("y4", &cellBHY4_, "y4/F"); // - treeCellsNose_ = fs_->make("TreeCellsNose", "Tree of all HGCnose cells"); + treeCellsNose_ = fs->make("TreeCellsNose", "Tree of all HGCnose cells"); treeCellsNose_->Branch("id", &cellId_, "id/I"); treeCellsNose_->Branch("zside", &cellSide_, "zside/I"); treeCellsNose_->Branch("subdet", &cellSubdet_, "subdet/I"); @@ -385,23 +388,18 @@ HGCalTriggerGeomTesterV9Imp2::HGCalTriggerGeomTesterV9Imp2(const edm::ParameterS treeCellsNose_->Branch("corner_y", cellCornersY_.get(), "corner_y[corner_n]/F"); treeCellsNose_->Branch("corner_z", cellCornersZ_.get(), "corner_z[corner_n]/F"); // - treeModuleErrors_ = fs_->make("TreeModuleErrors", "Tree of module mapping errors"); + treeModuleErrors_ = fs->make("TreeModuleErrors", "Tree of module mapping errors"); treeModuleErrors_->Branch("subdet", &moduleErrorSubdet_, "subdet/I"); treeModuleErrors_->Branch("layer", &moduleErrorLayer_, "layer/I"); treeModuleErrors_->Branch("waferu", &moduleErrorWaferU_, "waferu/I"); treeModuleErrors_->Branch("waferv", &moduleErrorWaferV_, "waferv/I"); } -/*****************************************************************/ -HGCalTriggerGeomTesterV9Imp2::~HGCalTriggerGeomTesterV9Imp2() -/*****************************************************************/ -{} - /*****************************************************************/ void HGCalTriggerGeomTesterV9Imp2::beginRun(const edm::Run& /*run*/, const edm::EventSetup& es) /*****************************************************************/ { - es.get().get("", triggerGeometry_); + triggerGeometry_ = es.getHandle(triggerGeomToken_); no_trigger_ = !checkMappingConsistency(); no_neighbors_ = !checkNeighborConsistency(); diff --git a/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp3.cc b/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp3.cc index d648de1dbb690..8ce09a5f6755a 100644 --- a/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp3.cc +++ b/L1Trigger/L1THGCal/test/HGCalTriggerGeomTesterV9Imp3.cc @@ -45,10 +45,11 @@ namespace { class HGCalTriggerGeomTesterV9Imp3 : public edm::stream::EDAnalyzer<> { public: explicit HGCalTriggerGeomTesterV9Imp3(const edm::ParameterSet&); - ~HGCalTriggerGeomTesterV9Imp3(); + ~HGCalTriggerGeomTesterV9Imp3() override = default; - virtual void beginRun(const edm::Run&, const edm::EventSetup&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void beginRun(const edm::Run&, const edm::EventSetup&) override; + void endRun(const edm::Run&, const edm::EventSetup&) override {} + void analyze(const edm::Event&, const edm::EventSetup&) override; private: void fillTriggerGeometry(); @@ -59,8 +60,8 @@ class HGCalTriggerGeomTesterV9Imp3 : public edm::stream::EDAnalyzer<> { void setTreeCellCornerSize(const size_t n); void setTreeTriggerCellNeighborSize(const size_t n); + const edm::ESGetToken triggerGeomToken_; edm::ESHandle triggerGeometry_; - edm::Service fs_; bool no_trigger_; bool no_neighbors_; TTree* treeModules_; @@ -210,12 +211,14 @@ class HGCalTriggerGeomTesterV9Imp3 : public edm::stream::EDAnalyzer<> { /*****************************************************************/ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterSet& conf) - : no_trigger_(false), + : triggerGeomToken_(esConsumes()), + no_trigger_(false), no_neighbors_(true) /*****************************************************************/ { + edm::Service fs; // initialize output trees - treeModules_ = fs_->make("TreeModules", "Tree of all HGC modules"); + treeModules_ = fs->make("TreeModules", "Tree of all HGC modules"); treeModules_->Branch("id", &moduleId_, "id/I"); treeModules_->Branch("zside", &moduleSide_, "zside/I"); treeModules_->Branch("subdet", &moduleSubdet_, "subdet/I"); @@ -290,7 +293,7 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeModules_->Branch("c_eta", moduleCell_eta_.get(), "c_eta[c_n]/F"); treeModules_->Branch("c_phi", moduleCell_phi_.get(), "c_phi[c_n]/F"); // - treeTriggerCells_ = fs_->make("TreeTriggerCells", "Tree of all HGC trigger cells"); + treeTriggerCells_ = fs->make("TreeTriggerCells", "Tree of all HGC trigger cells"); treeTriggerCells_->Branch("id", &triggerCellId_, "id/I"); treeTriggerCells_->Branch("zside", &triggerCellSide_, "zside/I"); treeTriggerCells_->Branch("subdet", &triggerCellSubdet_, "subdet/I"); @@ -358,7 +361,7 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeTriggerCells_->Branch("c_eta", triggerCellCell_eta_.get(), "c_eta[c_n]/F"); treeTriggerCells_->Branch("c_phi", triggerCellCell_phi_.get(), "c_phi[c_n]/F"); // - treeCells_ = fs_->make("TreeCells", "Tree of all HGC cells"); + treeCells_ = fs->make("TreeCells", "Tree of all HGC cells"); treeCells_->Branch("id", &cellId_, "id/I"); treeCells_->Branch("zside", &cellSide_, "zside/I"); treeCells_->Branch("subdet", &cellSubdet_, "subdet/I"); @@ -380,7 +383,7 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeCells_->Branch("corner_y", cellCornersY_.get(), "corner_y[corner_n]/F"); treeCells_->Branch("corner_z", cellCornersZ_.get(), "corner_z[corner_n]/F"); // - treeCellsBH_ = fs_->make("TreeCellsBH", "Tree of all BH cells"); + treeCellsBH_ = fs->make("TreeCellsBH", "Tree of all BH cells"); treeCellsBH_->Branch("id", &cellBHId_, "id/I"); treeCellsBH_->Branch("type", &cellBHType_, "type/I"); treeCellsBH_->Branch("zside", &cellBHSide_, "zside/I"); @@ -402,7 +405,7 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeCellsBH_->Branch("x4", &cellBHX4_, "x4/F"); treeCellsBH_->Branch("y4", &cellBHY4_, "y4/F"); // - treeCellsNose_ = fs_->make("TreeCellsNose", "Tree of all HGCnose cells"); + treeCellsNose_ = fs->make("TreeCellsNose", "Tree of all HGCnose cells"); treeCellsNose_->Branch("id", &cellId_, "id/I"); treeCellsNose_->Branch("zside", &cellSide_, "zside/I"); treeCellsNose_->Branch("subdet", &cellSubdet_, "subdet/I"); @@ -424,23 +427,18 @@ HGCalTriggerGeomTesterV9Imp3::HGCalTriggerGeomTesterV9Imp3(const edm::ParameterS treeCellsNose_->Branch("corner_y", cellCornersY_.get(), "corner_y[corner_n]/F"); treeCellsNose_->Branch("corner_z", cellCornersZ_.get(), "corner_z[corner_n]/F"); // - treeModuleErrors_ = fs_->make("TreeModuleErrors", "Tree of module mapping errors"); + treeModuleErrors_ = fs->make("TreeModuleErrors", "Tree of module mapping errors"); treeModuleErrors_->Branch("subdet", &moduleErrorSubdet_, "subdet/I"); treeModuleErrors_->Branch("layer", &moduleErrorLayer_, "layer/I"); treeModuleErrors_->Branch("waferu", &moduleErrorWaferU_, "waferu/I"); treeModuleErrors_->Branch("waferv", &moduleErrorWaferV_, "waferv/I"); } -/*****************************************************************/ -HGCalTriggerGeomTesterV9Imp3::~HGCalTriggerGeomTesterV9Imp3() -/*****************************************************************/ -{} - /*****************************************************************/ void HGCalTriggerGeomTesterV9Imp3::beginRun(const edm::Run& /*run*/, const edm::EventSetup& es) /*****************************************************************/ { - es.get().get("", triggerGeometry_); + triggerGeometry_ = es.getHandle(triggerGeomToken_); no_trigger_ = !checkMappingConsistency(); diff --git a/Validation/HGCalValidation/plugins/HGCalTriggerValidator.cc b/Validation/HGCalValidation/plugins/HGCalTriggerValidator.cc index d238c0228a64c..9149c9bc02fa6 100644 --- a/Validation/HGCalValidation/plugins/HGCalTriggerValidator.cc +++ b/Validation/HGCalValidation/plugins/HGCalTriggerValidator.cc @@ -23,8 +23,9 @@ #include "DataFormats/L1THGCal/interface/HGCalMulticluster.h" #include "DataFormats/L1THGCal/interface/HGCalTower.h" +#include "Geometry/Records/interface/CaloGeometryRecord.h" +#include "L1Trigger/L1THGCal/interface/HGCalTriggerGeometryBase.h" #include "L1Trigger/L1THGCal/interface/HGCalTriggerTools.h" - #include "L1Trigger/L1THGCal/interface/backend/HGCalTriggerClusterIdentificationBase.h" // @@ -93,7 +94,7 @@ struct Histograms { class HGCalTriggerValidator : public DQMGlobalEDAnalyzer { public: explicit HGCalTriggerValidator(const edm::ParameterSet &); - ~HGCalTriggerValidator() override; + ~HGCalTriggerValidator() override = default; private: void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &, Histograms &) const override; @@ -101,10 +102,11 @@ class HGCalTriggerValidator : public DQMGlobalEDAnalyzer { private: // ----------member data --------------------------- - edm::EDGetToken trigger_cells_token_; - edm::EDGetToken clusters_token_; - edm::EDGetToken multiclusters_token_; - edm::EDGetToken towers_token_; + const edm::EDGetToken trigger_cells_token_; + const edm::EDGetToken clusters_token_; + const edm::EDGetToken multiclusters_token_; + const edm::EDGetToken towers_token_; + const edm::ESGetToken trigGeom_token_; std::unique_ptr id_; @@ -118,13 +120,12 @@ HGCalTriggerValidator::HGCalTriggerValidator(const edm::ParameterSet &iConfig) multiclusters_token_{ consumes(iConfig.getParameter("Multiclusters"))}, towers_token_{consumes(iConfig.getParameter("Towers"))}, + trigGeom_token_(esConsumes()), id_{HGCalTriggerClusterIdentificationFactory::get()->create("HGCalTriggerClusterIdentificationBDT")} { id_->initialize(iConfig.getParameter("EGIdentification")); triggerTools_ = std::make_shared(); } -HGCalTriggerValidator::~HGCalTriggerValidator() {} - void HGCalTriggerValidator::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &iSetup, @@ -201,7 +202,7 @@ void HGCalTriggerValidator::dqmAnalyze(edm::Event const &iEvent, int cl3d_n = 0; int tower_n = 0; - triggerTools_->eventSetup(iSetup); + triggerTools_->eventSetup(iSetup, trigGeom_token_); // retrieve trigger cells edm::Handle trigger_cells_h;