Use ESGetToken in some of the test analyzers in SimMuon

Author: Sunanda

SimMuon/CSCDigitizer/test/CSCNoiseMatrixTest.cc

@@ -1,6 +1,5 @@
 #include "CalibMuon/CSCCalibration/interface/CSCConditions.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
@@ -12,9 +11,9 @@
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 
-class CSCNoiseMatrixTest : public edm::EDAnalyzer {
+class CSCNoiseMatrixTest : public edm::one::EDAnalyzer<> {
 public:
-  CSCNoiseMatrixTest(const edm::ParameterSet &pset) : theDbConditions(pset, consumesCollector()) {
+  CSCNoiseMatrixTest(const edm::ParameterSet &pset) : theDbConditions(pset, consumesCollector()), tokGeo_{esConsumes(edm::ESInputTag("", "idealForDigi"))} {
     edm::Service<edm::RandomNumberGenerator> rng;
     if (!rng.isAvailable()) {
       throw cms::Exception("Configuration") << "CSCNoiseMatrixTest requires the RandomNumberGeneratorService\n"
@@ -38,9 +37,7 @@ class CSCNoiseMatrixTest : public edm::EDAnalyzer {
     std::vector<float> binValues(nScaBins, 0.);
 
     // find the geometry & conditions for this event
-    edm::ESHandle<CSCGeometry> hGeom;
-    eventSetup.get<MuonGeometryRecord>().get("idealForDigi", hGeom);
-    const CSCGeometry *pGeom = &*hGeom;
+    const CSCGeometry *pGeom = &eventSetup.getData(tokGeo_);
 
     // try making a noisifier and using it
     const CSCGeometry::LayerContainer &layers = pGeom->layers();
@@ -63,6 +60,7 @@ class CSCNoiseMatrixTest : public edm::EDAnalyzer {
 
 private:
   CSCDbStripConditions theDbConditions;
+  const edm::ESGetToken<CSCGeometry, MuonGeometryRecord> tokGeo_;
 };
 
 DEFINE_FWK_MODULE(CSCNoiseMatrixTest);

SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc

@@ -19,9 +19,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
-#include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/DTGeometry/interface/DTLayer.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
@@ -42,6 +40,7 @@ DTDigiAnalyzer::DTDigiAnalyzer(const ParameterSet &pset)
   //   MuonDigiStatistics = new DTMuonDigiStatistics();
   //   HitsAnalysis = new DTHitsAnalysis();
   label = pset.getUntrackedParameter<string>("label");
+  tokGeo_ = esConsumes<DTGeometry, MuonGeometryRecord>();
   file = new TFile("DTDigiPlots.root", "RECREATE");
   file->cd();
   DigiTimeBox = new TH1F("DigiTimeBox", "Digi Time Box", 2048, 0, 1600);
@@ -80,8 +79,7 @@ void DTDigiAnalyzer::analyze(const Event &event, const EventSetup &eventSetup) {
   Handle<PSimHitContainer> simHits;
   event.getByToken(psim_token, simHits);
 
-  ESHandle<DTGeometry> muonGeom;
-  eventSetup.get<MuonGeometryRecord>().get(muonGeom);
+  auto muonGeom = eventSetup.getHandle(tokGeo_);
 
   DTWireIdMap wireMap;
 

SimMuon/DTDigitizer/test/DTDigiAnalyzer.h

@@ -14,7 +14,9 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimMuon/DTDigitizer/interface/Histograms.h"
 #include <DataFormats/MuonDetId/interface/DTWireId.h>
-#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
+#include "Geometry/DTGeometry/interface/DTGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 class TH1F;
 class TFile;
@@ -30,7 +32,7 @@ namespace edm {
   class EventSetup;
 }  // namespace edm
 
-class DTDigiAnalyzer : public edm::EDAnalyzer {
+class DTDigiAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   explicit DTDigiAnalyzer(const edm::ParameterSet &pset);
   ~DTDigiAnalyzer() override;
@@ -44,6 +46,8 @@ class DTDigiAnalyzer : public edm::EDAnalyzer {
   TH1F *DigiTimeBox;
   TFile *file;
   std::string label;
+  edm::ESGetToken<DTGeometry, MuonGeometryRecord> tokGeo_;
+
   //  DTMCStatistics        *MCStatistics;
   // DTMuonDigiStatistics  *MuonDigiStatistics;
   // DTHitsAnalysis        *HitsAnalysis;