Avoid compilation warnings in L1Trigger/L1THGCal

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<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>> track_token_;
   edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magf_token;
   edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geom_token;
+  edm::ESGetToken<HGCalTriggerGeometryBase, CaloGeometryRecord> trigGeom_token;
 
   int l1track_n_;
   std::vector<float> l1track_pt_;
@@ -68,6 +71,7 @@ void L1TriggerNtupleTrackTrigger::initialize(TTree& tree,
       collector.consumes<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>>(conf.getParameter<edm::InputTag>("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<TrackerGeometry>& 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) {

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<HGCalTriggerGeometryBase, CaloGeometryRecord>&);  // 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;

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<HGCalTriggerGeometryBase> triggerGeometry;
-  es.get<CaloGeometryRecord>().get(triggerGeometry);
+void HGCalTriggerTools::eventSetup(const edm::EventSetup& es, const edm::ESGetToken<HGCalTriggerGeometryBase, CaloGeometryRecord>& token) {
+  const edm::ESHandle<HGCalTriggerGeometryBase>& triggerGeometry = es.getHandle(token);
   setGeometry(triggerGeometry.product());
 }
 

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<HGCalTriggerGeometryBase, CaloGeometryRecord> triggerGeomToken_;
   edm::ESHandle<HGCalTriggerGeometryBase> triggerGeometry_;
-  edm::Service<TFileService> 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<HGCalTriggerGeometryBase, CaloGeometryRecord, edm::Transition::BeginRun>()),
+      no_trigger_(false),
       no_neighbors_(false)
 /*****************************************************************/
 {
   // initialize output trees
-  treeModules_ = fs_->make<TTree>("TreeModules", "Tree of all HGC modules");
+  edm::Service<TFileService> fs;
+  treeModules_ = fs->make<TTree>("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<TTree>("TreeTriggerCells", "Tree of all HGC trigger cells");
+  treeTriggerCells_ = fs->make<TTree>("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<TTree>("TreeCells", "Tree of all HGC cells");
+  treeCells_ = fs->make<TTree>("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<TTree>("TreeCellsBH", "Tree of all BH cells");
+  treeCellsBH_ = fs->make<TTree>("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<TTree>("TreeCellsNose", "Tree of all HGCnose cells");
+  treeCellsNose_ = fs->make<TTree>("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<TTree>("TreeModuleErrors", "Tree of module mapping errors");
+  treeModuleErrors_ = fs->make<TTree>("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<CaloGeometryRecord>().get("", triggerGeometry_);
+  triggerGeometry_ = es.getHandle(triggerGeomToken_);
 
   no_trigger_ = !checkMappingConsistency();
   no_neighbors_ = !checkNeighborConsistency();

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<HGCalTriggerGeometryBase, CaloGeometryRecord> triggerGeomToken_;
   edm::ESHandle<HGCalTriggerGeometryBase> triggerGeometry_;
-  edm::Service<TFileService> 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<HGCalTriggerGeometryBase, CaloGeometryRecord, edm::Transition::BeginRun>()),
+      no_trigger_(false),
       no_neighbors_(true)
 /*****************************************************************/
 {
+  edm::Service<TFileService> fs;
   // initialize output trees
-  treeModules_ = fs_->make<TTree>("TreeModules", "Tree of all HGC modules");
+  treeModules_ = fs->make<TTree>("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<TTree>("TreeTriggerCells", "Tree of all HGC trigger cells");
+  treeTriggerCells_ = fs->make<TTree>("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<TTree>("TreeCells", "Tree of all HGC cells");
+  treeCells_ = fs->make<TTree>("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<TTree>("TreeCellsBH", "Tree of all BH cells");
+  treeCellsBH_ = fs->make<TTree>("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<TTree>("TreeCellsNose", "Tree of all HGCnose cells");
+  treeCellsNose_ = fs->make<TTree>("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<TTree>("TreeModuleErrors", "Tree of module mapping errors");
+  treeModuleErrors_ = fs->make<TTree>("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<CaloGeometryRecord>().get("", triggerGeometry_);
+  triggerGeometry_ = es.getHandle(triggerGeomToken_);
 
   no_trigger_ = !checkMappingConsistency();
 

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,18 +94,19 @@ struct Histograms {
 class HGCalTriggerValidator : public DQMGlobalEDAnalyzer<Histograms> {
 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;
   void dqmAnalyze(edm::Event const &, edm::EventSetup const &, Histograms const &) const override;
 
 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<HGCalTriggerGeometryBase, CaloGeometryRecord> trigGeom_token_;
 
   std::unique_ptr<HGCalTriggerClusterIdentificationBase> id_;
 
@@ -118,13 +120,12 @@ HGCalTriggerValidator::HGCalTriggerValidator(const edm::ParameterSet &iConfig)
       multiclusters_token_{
           consumes<l1t::HGCalMulticlusterBxCollection>(iConfig.getParameter<edm::InputTag>("Multiclusters"))},
       towers_token_{consumes<l1t::HGCalTowerBxCollection>(iConfig.getParameter<edm::InputTag>("Towers"))},
+      trigGeom_token_(esConsumes()),
       id_{HGCalTriggerClusterIdentificationFactory::get()->create("HGCalTriggerClusterIdentificationBDT")} {
   id_->initialize(iConfig.getParameter<edm::ParameterSet>("EGIdentification"));
   triggerTools_ = std::make_shared<HGCalTriggerTools>();
 }
 
-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<l1t::HGCalTriggerCellBxCollection> trigger_cells_h;