added esConsumes to modules on EventFilter/SiPixelRawToDigi

cms-sw · Jun 30, 2020 · 1556c63 · 1556c63
1 parent 4227922
commit 1556c63
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/EventFilter/SiPixelRawToDigi/interface/PixelUnpackingRegions.h b/EventFilter/SiPixelRawToDigi/interface/PixelUnpackingRegions.h
@@ -4,6 +4,7 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "DataFormats/Math/interface/Point3D.h"
 #include "DataFormats/Math/interface/Vector3D.h"
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
@@ -12,6 +13,8 @@
 #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include <cmath>
@@ -119,6 +122,7 @@ class PixelUnpackingRegions {
   math::XYZPoint beamSpot_;
 
   edm::ESWatcher<SiPixelFedCablingMapRcd> watcherSiPixelFedCablingMap_;
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerGeomToken_;
 };
 
 #endif
diff --git a/EventFilter/SiPixelRawToDigi/plugins/SiPixelDigiToRaw.cc b/EventFilter/SiPixelRawToDigi/plugins/SiPixelDigiToRaw.cc
@@ -18,6 +18,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
@@ -66,6 +67,7 @@ class SiPixelDigiToRaw final : public edm::global::EDProducer<edm::LuminosityBlo
   CMS_THREAD_GUARD(lock_) mutable std::shared_ptr<pr::Cache> previousCache_;
   const edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> tPixelDigi;
   const edm::EDGetTokenT<PixelFEDChannelCollection> theBadPixelFEDChannelsToken;
+  const edm::ESGetToken<SiPixelFedCablingMap, SiPixelFedCablingMapRcd> cabelingMapToken_;
   const edm::EDPutTokenT<FEDRawDataCollection> putToken_;
   const bool usePilotBlade = false;  // I am not yet sure we need it here?
   const bool usePhase1;
@@ -76,6 +78,8 @@ using namespace std;
 SiPixelDigiToRaw::SiPixelDigiToRaw(const edm::ParameterSet& pset)
     : tPixelDigi{consumes<edm::DetSetVector<PixelDigi>>(pset.getParameter<edm::InputTag>("InputLabel"))},
       theBadPixelFEDChannelsToken{consumes<PixelFEDChannelCollection>(pset.getParameter<edm::InputTag>("InputLabel"))},
+      cabelingMapToken_(
+          esConsumes<SiPixelFedCablingMap, SiPixelFedCablingMapRcd, edm::Transition::BeginLuminosityBlock>()),
       putToken_{produces<FEDRawDataCollection>()},
       usePhase1{pset.getParameter<bool>("UsePhase1")} {
   // Define EDProduct type
@@ -93,8 +97,7 @@ std::shared_ptr<pr::Cache> SiPixelDigiToRaw::globalBeginLuminosityBlock(edm::Lum
   std::unique_ptr<std::atomic_flag, decltype(rel)> guard(&lock_, rel);
 
   if (recordWatcher.check(es)) {
-    edm::ESHandle<SiPixelFedCablingMap> cablingMap;
-    es.get<SiPixelFedCablingMapRcd>().get(cablingMap);
+    edm::ESHandle<SiPixelFedCablingMap> cablingMap = es.getHandle(cabelingMapToken_);
     previousCache_ = std::make_shared<pr::Cache>();
     previousCache_->cablingTree_ = cablingMap->cablingTree();
     previousCache_->frameReverter_ = std::make_unique<SiPixelFrameReverter>(cablingMap.product());

diff --git a/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc b/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc
@@ -30,8 +30,6 @@
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
 #include "EventFilter/SiPixelRawToDigi/interface/PixelDataFormatter.h"
 
-#include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
-
 #include "DataFormats/SiPixelDetId/interface/PixelFEDChannel.h"
 #include "EventFilter/SiPixelRawToDigi/interface/PixelUnpackingRegions.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
@@ -51,6 +49,9 @@ SiPixelRawToDigi::SiPixelRawToDigi(const edm::ParameterSet& conf)
   usererrorlist = config_.getParameter<std::vector<int>>("UserErrorList");
 
   tFEDRawDataCollection = consumes<FEDRawDataCollection>(config_.getParameter<edm::InputTag>("InputLabel"));
+  if (useQuality) {
+    tSiPixelQuality = esConsumes<SiPixelQuality, SiPixelQualityRcd>();
+  }
 
   //start counters
   ndigis = 0;
@@ -161,8 +162,7 @@ void SiPixelRawToDigi::produce(edm::Event& ev, const edm::EventSetup& es) {
   // initialize quality record or update if necessary
   if (qualityWatcher.check(es) && useQuality) {
     // quality info for dead pixel modules or ROCs
-    edm::ESHandle<SiPixelQuality> qualityInfo;
-    es.get<SiPixelQualityRcd>().get(qualityInfo);
+    edm::ESHandle<SiPixelQuality> qualityInfo = es.getHandle(tSiPixelQuality);
     badPixelInfo_ = qualityInfo.product();
     if (!badPixelInfo_) {
       edm::LogError("SiPixelQualityNotPresent")

diff --git a/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.h b/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.h
@@ -11,11 +11,13 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
 #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
 #include "CondFormats/DataRecord/interface/SiPixelQualityRcd.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Utilities/interface/CPUTimer.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 class SiPixelFedCablingTree;
 class SiPixelFedCabling;
@@ -53,7 +55,7 @@ class SiPixelRawToDigi : public edm::stream::EDProducer<> {
   edm::ESWatcher<SiPixelFedCablingMapRcd> recordWatcher;
   edm::ESWatcher<SiPixelQualityRcd> qualityWatcher;
   edm::InputTag label;
-
+  edm::ESGetToken<SiPixelQuality, SiPixelQualityRcd> tSiPixelQuality;
   int ndigis;
   int nwords;
   bool usePilotBlade;

diff --git a/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc b/EventFilter/SiPixelRawToDigi/src/PixelUnpackingRegions.cc
@@ -7,8 +7,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
 
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
@@ -33,6 +31,7 @@ PixelUnpackingRegions::PixelUnpackingRegions(const edm::ParameterSet& conf, edm:
   inputs_ = regPSet.getParameter<std::vector<edm::InputTag> >("inputs");
   dPhi_ = regPSet.getParameter<std::vector<double> >("deltaPhi");
   maxZ_ = regPSet.getParameter<std::vector<double> >("maxZ");
+  trackerGeomToken_ = iC.esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>();
 
   tBeamSpot = iC.consumes<reco::BeamSpot>(beamSpotTag_);
   for (unsigned int t = 0; t < inputs_.size(); t++)
@@ -81,9 +80,8 @@ void PixelUnpackingRegions::initialize(const edm::EventSetup& es) {
     es.get<SiPixelFedCablingMapRcd>().get(cablingMap);
     cabling_ = cablingMap->cablingTree();
 
-    edm::ESHandle<TrackerGeometry> geom;
     // get the TrackerGeom
-    es.get<TrackerDigiGeometryRecord>().get(geom);
+    edm::ESHandle<TrackerGeometry> geom = es.getHandle(trackerGeomToken_);
 
     // switch on the phase1
     unsigned int fedMin = FEDNumbering::MINSiPixelFEDID;  // phase0