Merge pull request #39700 from wddgit/legacyMigrationJetMETCorrection…

…sMinBias JetMETCorrections/MinBias legacy migration
cms-sw · Oct 12, 2022 · 018b8bc · 018b8bc
2 parents 13301bd + 65fdd33
commit 018b8bc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/JetMETCorrections/MinBias/interface/MinBias.h b/JetMETCorrections/MinBias/interface/MinBias.h
@@ -6,36 +6,29 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 
 #include "TTree.h"
 
-namespace edm {
-  class ParameterSet;
-  class Event;
-  class EventSetup;
-}  // namespace edm
-
-//
-// class decleration
-//
 namespace cms {
-  class MinBias : public edm::EDAnalyzer {
+  class MinBias : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
   public:
     explicit MinBias(const edm::ParameterSet&);
 
     void analyze(const edm::Event&, const edm::EventSetup&) override;
     void beginJob() override;
     void beginRun(edm::Run const&, edm::EventSetup const&) override;
+    void endRun(edm::Run const&, edm::EventSetup const&) override;
     void endJob() override;
 
   private:
@@ -46,6 +39,7 @@ namespace cms {
     edm::EDGetTokenT<HBHERecHitCollection> hbheToken_;
     edm::EDGetTokenT<HORecHitCollection> hoToken_;
     edm::EDGetTokenT<HFRecHitCollection> hfToken_;
+    edm::ESGetToken<CaloGeometry, CaloGeometryRecord> caloGeometryESToken_;
     // stuff for histogramms
     bool allowMissingInputs_;
     //

diff --git a/JetMETCorrections/MinBias/src/MinBias.cc b/JetMETCorrections/MinBias/src/MinBias.cc
@@ -3,11 +3,11 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "JetMETCorrections/MinBias/interface/MinBias.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 
 namespace cms {
-  MinBias::MinBias(const edm::ParameterSet& iConfig) : geo_(nullptr) {
+  MinBias::MinBias(const edm::ParameterSet& iConfig)
+      : caloGeometryESToken_(esConsumes<edm::Transition::BeginRun>()), geo_(nullptr) {
     // get names of modules, producing object collections
     hbheLabel_ = iConfig.getParameter<std::string>("hbheInput");
     hoLabel_ = iConfig.getParameter<std::string>("hoInput");
@@ -34,10 +34,8 @@ namespace cms {
     myTree_->Branch("mom4", &mom4, "mom4/F");
   }
 
-  void MinBias::beginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) {
-    edm::ESHandle<CaloGeometry> pG;
-    iSetup.get<CaloGeometryRecord>().get(pG);
-    geo_ = pG.product();
+  void MinBias::beginRun(edm::Run const&, edm::EventSetup const& iSetup) {
+    geo_ = &iSetup.getData(caloGeometryESToken_);
     std::vector<DetId> did = geo_->getValidDetIds();
 
     for (auto const& id : did) {
@@ -51,6 +49,8 @@ namespace cms {
     }
   }
 
+  void MinBias::endRun(edm::Run const&, edm::EventSetup const& iSetup) {}
+
   void MinBias::endJob() {
     const HcalGeometry* hgeo = static_cast<const HcalGeometry*>(geo_->getSubdetectorGeometry(DetId::Hcal, 1));
     const std::vector<DetId>& did = hgeo->getValidDetIds();
@@ -105,7 +105,7 @@ namespace cms {
   //
 
   // ------------ method called to produce the data  ------------
-  void MinBias::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  void MinBias::analyze(const edm::Event& iEvent, const edm::EventSetup&) {
     if (!hbheLabel_.empty()) {
       edm::Handle<HBHERecHitCollection> hbhe;
       iEvent.getByToken(hbheToken_, hbhe);