Migrate HiEvtPlaneFlatProducer and EvtPlaneProducer to esConsumes()

Author: makortel

RecoHI/HiEvtPlaneAlgos/interface/LoadEPDB.h

@@ -10,27 +10,20 @@
 #include "CondFormats/HIObjects/interface/RPFlatParams.h"
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
-
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-
 #include "DataFormats/HeavyIonEvent/interface/EvtPlane.h"
 #include "RecoHI/HiEvtPlaneAlgos/interface/HiEvtPlaneFlatten.h"
 #include "RecoHI/HiEvtPlaneAlgos/interface/HiEvtPlaneList.h"
 #include <vector>
 
 class LoadEPDB {
 public:
-  explicit LoadEPDB(const edm::ESHandle<RPFlatParams> flatparmsDB_, HiEvtPlaneFlatten** flat) {
+  explicit LoadEPDB(const RPFlatParams& flatparmsDB_, HiEvtPlaneFlatten** flat) {
     int Hbins;
     int Obins;
-    int flatTableSize = flatparmsDB_->m_table.size();
+    int flatTableSize = flatparmsDB_.m_table.size();
     genFlatPsi_ = kTRUE;
     if (flatTableSize < flat[0]->getHBins() + 2 * flat[0]->getOBins()) {
       genFlatPsi_ = kFALSE;
@@ -39,7 +32,7 @@ class LoadEPDB {
       Obins = flat[0]->getOBins();
 
       for (int i = 0; i < flatTableSize; i++) {
-        const RPFlatParams::EP* thisBin = &(flatparmsDB_->m_table[i]);
+        const RPFlatParams::EP* thisBin = &(flatparmsDB_.m_table[i]);
         for (int j = 0; j < hi::NumEPNames; j++) {
           int indx = thisBin->RPNameIndx[j];
           if (indx < 0 || indx >= hi::NumEPNames) {
@@ -62,13 +55,13 @@ class LoadEPDB {
       }
       int cbins = 0;
       while (flatTableSize > Hbins + 2 * Obins + cbins) {
-        const RPFlatParams::EP* thisBin = &(flatparmsDB_->m_table[Hbins + 2 * Obins + cbins]);
+        const RPFlatParams::EP* thisBin = &(flatparmsDB_.m_table[Hbins + 2 * Obins + cbins]);
         double centbinning = thisBin->x[0];
         int ncentbins = (int)thisBin->y[0] + 0.01;
         if (ncentbins == 0)
           break;
         for (int j = 0; j < ncentbins; j++) {
-          const RPFlatParams::EP* thisBin = &(flatparmsDB_->m_table[Hbins + 2 * Obins + cbins + j + 1]);
+          const RPFlatParams::EP* thisBin = &(flatparmsDB_.m_table[Hbins + 2 * Obins + cbins + j + 1]);
           if (fabs(centbinning - 1.) < 0.01) {
             for (int i = 0; i < hi::NumEPNames; i++) {
               flat[i]->setCentRes1(j, thisBin->x[i], thisBin->y[i]);

RecoHI/HiEvtPlaneAlgos/src/EvtPlaneProducer.cc

@@ -30,7 +30,6 @@ Description: <one line class summary>
 #include "FWCore/Framework/interface/EventSetup.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -179,7 +178,6 @@ class EvtPlaneProducer : public edm::stream::EDProducer<> {
   EPCuts cuts_;
 
   std::string centralityVariable_;
-  std::string centralityLabel_;
   std::string centralityMC_;
 
   edm::InputTag centralityBinTag_;
@@ -212,6 +210,9 @@ class EvtPlaneProducer : public edm::stream::EDProducer<> {
   edm::InputTag chi2MapLostTag_;
   edm::EDGetTokenT<edm::ValueMap<float>> chi2MapLostToken_;
 
+  edm::ESGetToken<CentralityTable, HeavyIonRcd> centralityToken_;
+  edm::ESGetToken<RPFlatParams, HeavyIonRPRcd> flatparmsToken_;
+
   bool loadDB_;
   double minet_;
   double maxet_;
@@ -383,7 +384,10 @@ EvtPlaneProducer::EvtPlaneProducer(const edm::ParameterSet &iConfig)
   if (iConfig.exists("nonDefaultGlauberModel")) {
     centralityMC_ = iConfig.getParameter<std::string>("nonDefaultGlauberModel");
   }
-  centralityLabel_ = centralityVariable_ + centralityMC_;
+  centralityToken_ = esConsumes(edm::ESInputTag("", centralityVariable_ + centralityMC_));
+  if (loadDB_) {
+    flatparmsToken_ = esConsumes();
+  }
 
   centralityBinToken_ = consumes<int>(centralityBinTag_);
 
@@ -438,9 +442,8 @@ void EvtPlaneProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup
     //
     //Get Size of Centrality Table
     //
-    edm::ESHandle<CentralityTable> centDB_;
-    iSetup.get<HeavyIonRcd>().get(centralityLabel_, centDB_);
-    nCentBins_ = centDB_->m_table.size();
+    auto const &centDB = iSetup.getData(centralityToken_);
+    nCentBins_ = centDB.m_table.size();
     for (int i = 0; i < NumEPNames; i++) {
       if (caloCentRef_ > 0) {
         int minbin = (caloCentRef_ - caloCentRefWidth_ / 2.) * nCentBins_ / 100.;
@@ -458,9 +461,7 @@ void EvtPlaneProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup
   //Get flattening parameter file.
   //
   if (loadDB_ && hirpWatcher_.check(iSetup)) {
-    edm::ESHandle<RPFlatParams> flatparmsDB_;
-    iSetup.get<HeavyIonRPRcd>().get(flatparmsDB_);
-    LoadEPDB db(flatparmsDB_, flat);
+    LoadEPDB db(iSetup.getData(flatparmsToken_), flat);
     if (!db.IsSuccess()) {
       loadDB_ = kFALSE;
     }

RecoHI/HiEvtPlaneAlgos/src/HiEvtPlaneFlatProducer.cc

@@ -9,7 +9,6 @@
 #include "Math/Vector3D.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
 #include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
 
@@ -57,7 +56,6 @@ class HiEvtPlaneFlatProducer : public edm::stream::EDProducer<> {
   // ----------member data ---------------------------
 
   std::string centralityVariable_;
-  std::string centralityLabel_;
   std::string centralityMC_;
 
   edm::InputTag centralityBinTag_;
@@ -78,6 +76,8 @@ class HiEvtPlaneFlatProducer : public edm::stream::EDProducer<> {
 
   edm::ESWatcher<HeavyIonRcd> hiWatcher;
   edm::ESWatcher<HeavyIonRPRcd> hirpWatcher;
+  edm::ESGetToken<CentralityTable, HeavyIonRcd> centralityESToken_;
+  edm::ESGetToken<RPFlatParams, HeavyIonRPRcd> flatparmsToken_;
 
   const int FlatOrder_;
   int NumFlatBins_;
@@ -115,7 +115,8 @@ HiEvtPlaneFlatProducer::HiEvtPlaneFlatProducer(const edm::ParameterSet& iConfig)
   if (iConfig.exists("nonDefaultGlauberModel")) {
     centralityMC_ = iConfig.getParameter<std::string>("nonDefaultGlauberModel");
   }
-  centralityLabel_ = centralityVariable_ + centralityMC_;
+  centralityESToken_ = esConsumes(edm::ESInputTag("", centralityVariable_ + centralityMC_));
+  flatparmsToken_ = esConsumes();
 
   centralityBinToken_ = consumes<int>(centralityBinTag_);
 
@@ -158,9 +159,8 @@ void HiEvtPlaneFlatProducer::produce(edm::Event& iEvent, const edm::EventSetup&
     //
     //Get Size of Centrality Table
     //
-    edm::ESHandle<CentralityTable> centDB_;
-    iSetup.get<HeavyIonRcd>().get(centralityLabel_, centDB_);
-    nCentBins_ = centDB_->m_table.size();
+    auto const& centDB = iSetup.getData(centralityESToken_);
+    nCentBins_ = centDB.m_table.size();
     for (int i = 0; i < NumEPNames; i++) {
       if (caloCentRef_ > 0) {
         int minbin = (caloCentRef_ - caloCentRefWidth_ / 2.) * nCentBins_ / 100.;
@@ -178,9 +178,7 @@ void HiEvtPlaneFlatProducer::produce(edm::Event& iEvent, const edm::EventSetup&
   //Get flattening parameter file.
   //
   if (hirpWatcher.check(iSetup)) {
-    edm::ESHandle<RPFlatParams> flatparmsDB_;
-    iSetup.get<HeavyIonRPRcd>().get(flatparmsDB_);
-    LoadEPDB db(flatparmsDB_, flat);
+    LoadEPDB db(iSetup.getData(flatparmsToken_), flat);
   }  //rp record change
 
   //