migrate to esconsumes several test codes in the SiStrip area

Author: mmusich

CalibFormats/SiStripObjects/test/plugins/module.cc

@@ -1,9 +1,18 @@
+// system includes
+#include <algorithm>
+#include <iostream>
+#include <sstream>
+#include <time.h>
+#include <vector>
+#include <cstdint>
 
+// user includes
 #include "CalibFormats/SiStripObjects/interface/SiStripHashedDetId.h"
-#include "CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
@@ -12,18 +21,30 @@
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include <algorithm>
-#include <iostream>
-#include <sstream>
-#include <time.h>
-#include <vector>
-#include <cstdint>
+
+/**
+   @class test_SiStripHashedDetId
+   @author R.Bainbridge
+   @brief Simple class that tests SiStripHashedDetId.
+*/
+class testSiStripHashedDetId : public edm::one::EDAnalyzer<> {
+public:
+  testSiStripHashedDetId(const edm::ParameterSet &);
+  ~testSiStripHashedDetId();
+
+  void initialize(edm::EventSetup const &);
+  void analyze(const edm::Event &, const edm::EventSetup &);
+
+private:
+  //-------------- member data ----------------//
+  const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken_;
+};
 
 using namespace sistrip;
 
 // -----------------------------------------------------------------------------
 //
-testSiStripHashedDetId::testSiStripHashedDetId(const edm::ParameterSet &pset) {
+testSiStripHashedDetId::testSiStripHashedDetId(const edm::ParameterSet &pset) : geomToken_(esConsumes()) {
   edm::LogVerbatim(mlDqmCommon_) << "[testSiStripHashedDetId::" << __func__ << "]"
                                  << " Constructing object...";
 }
@@ -42,8 +63,7 @@ void testSiStripHashedDetId::initialize(const edm::EventSetup &setup) {
                                  << " Tests the generation of DetId hash map...";
 
   // Retrieve geometry
-  edm::ESHandle<TrackerGeometry> geom;
-  setup.get<TrackerDigiGeometryRecord>().get(geom);
+  edm::ESHandle geom = setup.getHandle(geomToken_);
 
   // Build list of DetIds
   std::vector<uint32_t> dets;
@@ -182,3 +202,5 @@ void testSiStripHashedDetId::analyze(const edm::Event &event, const edm::EventSe
   LogTrace(mlDqmCommon_) << "[testSiStripHashedDetId::" << __func__ << "]"
                          << " Analyzing run/event " << event.id().run() << "/" << event.id().event();
 }
+
+DEFINE_FWK_MODULE(testSiStripHashedDetId);

CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc

@@ -22,7 +22,7 @@
 
 // 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/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -40,48 +40,26 @@
 // class declaration
 //
 
-class CheckPhase2Cabling : public edm::EDAnalyzer {
+class CheckPhase2Cabling : public edm::one::EDAnalyzer<> {
 public:
   explicit CheckPhase2Cabling(const edm::ParameterSet&);
   ~CheckPhase2Cabling();
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-  virtual void beginJob();
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
-  virtual void endJob();
-
-  //virtual void beginRun(edm::Run const&, edm::EventSetup const&);
-  //virtual void endRun(edm::Run const&, edm::EventSetup const&);
-  //virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
-  //virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
 
   // ----------member data ---------------------------
+  const edm::ESGetToken<Phase2TrackerCabling, Phase2TrackerCablingRcd> cablingToken_;
 };
 
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
 //
 // constructors and destructor
 //
-CheckPhase2Cabling::CheckPhase2Cabling(const edm::ParameterSet& iConfig)
-
-{
-  //now do what ever initialization is needed
-}
-
-CheckPhase2Cabling::~CheckPhase2Cabling() {
-  // do anything here that needs to be done at desctruction time
-  // (e.g. close files, deallocate resources etc.)
-}
+CheckPhase2Cabling::CheckPhase2Cabling(const edm::ParameterSet& iConfig) : cablingToken_(esConsumes()) {}
 
+CheckPhase2Cabling::~CheckPhase2Cabling() = default;
 //
 // member functions
 //
@@ -90,8 +68,7 @@ CheckPhase2Cabling::~CheckPhase2Cabling() {
 void CheckPhase2Cabling::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
 
-  ESHandle<Phase2TrackerCabling> cablingHandle;
-  iSetup.get<Phase2TrackerCablingRcd>().get(cablingHandle);
+  ESHandle<Phase2TrackerCabling> cablingHandle = iSetup.getHandle(cablingToken_);
 
   // print general information about the cabling
   std::cout << cablingHandle->summaryDescription() << std::endl;
@@ -116,44 +93,6 @@ void CheckPhase2Cabling::analyze(const edm::Event& iEvent, const edm::EventSetup
   std::cout << powerGroup.description(1) << std::endl;
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void CheckPhase2Cabling::beginJob() {}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void CheckPhase2Cabling::endJob() {}
-
-// ------------ method called when starting to processes a run  ------------
-/*
-void 
-CheckPhase2Cabling::beginRun(edm::Run const&, edm::EventSetup const&)
-{
-}
-*/
-
-// ------------ method called when ending the processing of a run  ------------
-/*
-void 
-CheckPhase2Cabling::endRun(edm::Run const&, edm::EventSetup const&)
-{
-}
-*/
-
-// ------------ method called when starting to processes a luminosity block  ------------
-/*
-void 
-CheckPhase2Cabling::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&)
-{
-}
-*/
-
-// ------------ method called when ending the processing of a luminosity block  ------------
-/*
-void 
-CheckPhase2Cabling::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&)
-{
-}
-*/
-
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
 void CheckPhase2Cabling::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   //The following says we do not know what parameters are allowed so do no validation

CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.h

@@ -1,20 +1,46 @@
-#include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
-#include "CalibTracker/Records/interface/SiStripQualityRcd.h"
-
-#include "CalibTracker/SiStripESProducers/test/testSiStripQualityESProducer.h"
-
+// system includes
 #include <iostream>
 #include <stdio.h>
 #include <sys/time.h>
 #include <sstream>
 
+// user include files
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
+#include "CalibTracker/Records/interface/SiStripQualityRcd.h"
+
+class testSiStripQualityESProducer : public edm::one::EDAnalyzer<> {
+public:
+  explicit testSiStripQualityESProducer(const edm::ParameterSet&);
+  ~testSiStripQualityESProducer() = default;
+
+  void analyze(const edm::Event&, const edm::EventSetup&);
+
+private:
+  void printObject(const SiStripQuality*);
+
+  const edm::ESGetToken<SiStripQuality, SiStripQualityRcd> qualityToken_;
+  const edm::ESGetToken<SiStripQuality, SiStripQualityRcd> qualityTokenTwo_;
+  bool printdebug_;
+  unsigned long long m_cacheID_;
+  bool firstIOV;
+  bool twoRecordComparison_;
+  SiStripQuality* m_Quality_;
+};
+
 testSiStripQualityESProducer::testSiStripQualityESProducer(const edm::ParameterSet& iConfig)
-    : printdebug_(iConfig.getUntrackedParameter<bool>("printDebug", false)),
+    : qualityToken_(esConsumes(edm::ESInputTag("", iConfig.getUntrackedParameter<std::string>("dataLabel", "")))),
+      qualityTokenTwo_(esConsumes(edm::ESInputTag("", iConfig.getUntrackedParameter<std::string>("dataLabelTwo", "")))),
+      printdebug_(iConfig.getUntrackedParameter<bool>("printDebug", false)),
       m_cacheID_(0),
       firstIOV(true),
-      twoRecordComparison_(iConfig.getUntrackedParameter<bool>("twoRecordComparison", false)),
-      dataLabel_(iConfig.getUntrackedParameter<std::string>("dataLabel", "")),
-      dataLabelTwo_(iConfig.getUntrackedParameter<std::string>("dataLabelTwo", "")) {}
+      twoRecordComparison_(iConfig.getUntrackedParameter<bool>("twoRecordComparison", false)) {}
 
 void testSiStripQualityESProducer::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   unsigned long long cacheID = iSetup.get<SiStripQualityRcd>().cacheIdentifier();
@@ -29,8 +55,7 @@ void testSiStripQualityESProducer::analyze(const edm::Event& e, const edm::Event
   //&&&&&&&&&&&&&&&&&&
   //First Record
   //&&&&&&&&&&&&&&&&&&
-  edm::ESHandle<SiStripQuality> SiStripQualityESH_;
-  iSetup.get<SiStripQualityRcd>().get(dataLabel_, SiStripQualityESH_);
+  edm::ESHandle<SiStripQuality> SiStripQualityESH_ = iSetup.getHandle(qualityToken_);
   edm::LogInfo("testSiStripQualityESProducer")
       << canvas << "[testSiStripQualityESProducer::analyze] Print SiStripQualityRecord" << canvas << std::endl;
   printObject(SiStripQualityESH_.product());
@@ -40,7 +65,7 @@ void testSiStripQualityESProducer::analyze(const edm::Event& e, const edm::Event
   //&&&&&&&&&&&&&&&&&&
   edm::ESHandle<SiStripQuality> twoSiStripQualityESH_;
   if (twoRecordComparison_) {
-    iSetup.get<SiStripQualityRcd>().get(dataLabelTwo_, twoSiStripQualityESH_);
+    twoSiStripQualityESH_ = iSetup.getHandle(qualityTokenTwo_);
     edm::LogInfo("testSiStripQualityESProducer")
         << canvas << "[testSiStripQualityESProducer::analyze] Print Second SiStripQualityRecord" << canvas << std::endl;
     printObject(twoSiStripQualityESH_.product());
@@ -128,3 +153,8 @@ void testSiStripQualityESProducer::printObject(const SiStripQuality* SiStripQual
 
   edm::LogInfo("testSiStripQualityESProducer") << ss.str();
 }
+
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+DEFINE_FWK_MODULE(testSiStripQualityESProducer);