added esConsumes to modules in JetMETCorrections/Type1MET

JetMETCorrections/Type1MET/interface/AddCorrectionsToGenericMET.h

@@ -31,12 +31,12 @@ class AddCorrectionsToGenericMET {
 
   void setCorTokens(std::vector<edm::EDGetTokenT<CorrMETData> > const& corrTokens);
 
-  reco::MET getCorrectedMET(const reco::MET& srcMET, edm::Event& evt, const edm::EventSetup& es);
-  reco::PFMET getCorrectedPFMET(const reco::PFMET& srcMET, edm::Event& evt, const edm::EventSetup& es);
-  reco::CaloMET getCorrectedCaloMET(const reco::CaloMET& srcMET, edm::Event& evt, const edm::EventSetup& es);
+  reco::MET getCorrectedMET(const reco::MET& srcMET, edm::Event& evt);
+  reco::PFMET getCorrectedPFMET(const reco::PFMET& srcMET, edm::Event& evt);
+  reco::CaloMET getCorrectedCaloMET(const reco::CaloMET& srcMET, edm::Event& evt);
 
 private:
-  CorrMETData getCorrection(const reco::MET& srcMET, edm::Event& evt, const edm::EventSetup& es);
+  CorrMETData getCorrection(const reco::MET& srcMET, edm::Event& evt);
 
   std::vector<edm::EDGetTokenT<CorrMETData> > corrTokens_;
   reco::Candidate::LorentzVector constructP4From(const reco::MET& met, const CorrMETData& correction);

JetMETCorrections/Type1MET/interface/CorrectedMETProducerT.h

@@ -35,94 +35,76 @@
 
 #include <vector>
 
-namespace CorrectedMETProducer_namespace
-{
+namespace CorrectedMETProducer_namespace {
   template <typename T>
-  reco::Candidate::LorentzVector correctedP4(const T& rawMEt, const CorrMETData& correction)
-  {
+  reco::Candidate::LorentzVector correctedP4(const T& rawMEt, const CorrMETData& correction) {
     double correctedMEtPx = rawMEt.px() + correction.mex;
     double correctedMEtPy = rawMEt.py() + correction.mey;
-    double correctedMEtPt = sqrt(correctedMEtPx*correctedMEtPx + correctedMEtPy*correctedMEtPy);
+    double correctedMEtPt = sqrt(correctedMEtPx * correctedMEtPx + correctedMEtPy * correctedMEtPy);
     return reco::Candidate::LorentzVector(correctedMEtPx, correctedMEtPy, 0., correctedMEtPt);
   }
 
   template <typename T>
-  double correctedSumEt(const T& rawMEt, const CorrMETData& correction)
-  {
+  double correctedSumEt(const T& rawMEt, const CorrMETData& correction) {
     return rawMEt.sumEt() + correction.sumet;
   }
 
   template <typename T>
-  class CorrectedMETFactoryT
-  {
-    public:
-
-     T operator()(const T&, const CorrMETData&) const
-     {
-       assert(0); // "place-holder" for template instantiations for concrete T types only, **not** to be called
-     }
+  class CorrectedMETFactoryT {
+  public:
+    T operator()(const T&, const CorrMETData&) const {
+      assert(0);  // "place-holder" for template instantiations for concrete T types only, **not** to be called
+    }
   };
-}
+}  // namespace CorrectedMETProducer_namespace
 
-template<typename T>
-class CorrectedMETProducerT : public edm::stream::EDProducer<>  
-{
+template <typename T>
+class CorrectedMETProducerT : public edm::stream::EDProducer<> {
   typedef std::vector<T> METCollection;
 
- public:
-
+public:
   explicit CorrectedMETProducerT(const edm::ParameterSet& cfg)
-    : moduleLabel_(cfg.getParameter<std::string>("@module_label")),
-      algorithm_(0)
-  {
+      : moduleLabel_(cfg.getParameter<std::string>("@module_label")), algorithm_(0) {
     token_ = consumes<METCollection>(cfg.getParameter<edm::InputTag>("src"));
 
     algorithm_ = new METCorrectionAlgorithm(cfg, consumesCollector());
 
     produces<METCollection>("");
   }
-  ~CorrectedMETProducerT()
-  {
-    delete algorithm_;
-  }
-
+  ~CorrectedMETProducerT() { delete algorithm_; }
+
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
-    desc.add<edm::InputTag>("src",edm::InputTag("corrPfMetType1", "type1"));
-    descriptions.add(defaultModuleLabel<CorrectedMETProducerT<T> >(),desc);
+    desc.add<edm::InputTag>("src", edm::InputTag("corrPfMetType1", "type1"));
+    descriptions.add(defaultModuleLabel<CorrectedMETProducerT<T> >(), desc);
   }
 
- private:
-
-  void produce(edm::Event& evt, const edm::EventSetup& es)
-  {
+private:
+  void produce(edm::Event& evt, const edm::EventSetup& es) {
     std::unique_ptr<METCollection> correctedMEtCollection(new METCollection);
 
     edm::Handle<METCollection> rawMEtCollection;
     evt.getByToken(token_, rawMEtCollection);
 
-    for ( typename METCollection::const_iterator rawMEt = rawMEtCollection->begin();
-	  rawMEt != rawMEtCollection->end(); ++rawMEt ) {
-      CorrMETData correction = algorithm_->compMETCorrection(evt, es);
+    for (typename METCollection::const_iterator rawMEt = rawMEtCollection->begin(); rawMEt != rawMEtCollection->end();
+         ++rawMEt) {
+      CorrMETData correction = algorithm_->compMETCorrection(evt);
 
-      static const CorrectedMETProducer_namespace::CorrectedMETFactoryT<T> correctedMET_factory {};
+      static const CorrectedMETProducer_namespace::CorrectedMETFactoryT<T> correctedMET_factory{};
       T correctedMEt = correctedMET_factory(*rawMEt, correction);
 
       correctedMEtCollection->push_back(correctedMEt);
     }
-	  
-//--- add collection of MET objects with Type 1 / Type 1 + 2 corrections applied to the event
+
+    //--- add collection of MET objects with Type 1 / Type 1 + 2 corrections applied to the event
     evt.put(std::move(correctedMEtCollection));
   }
 
   std::string moduleLabel_;
 
   edm::EDGetTokenT<METCollection> token_;
 
-  METCorrectionAlgorithm* algorithm_; // algorithm for computing Type 1 / Type 1 + 2 MET corrections
+  METCorrectionAlgorithm* algorithm_;  // algorithm for computing Type 1 / Type 1 + 2 MET corrections
 };
 
 #endif
-
-
-

JetMETCorrections/Type1MET/interface/METCorrectionAlgorithm.h

@@ -34,7 +34,7 @@ class METCorrectionAlgorithm {
   explicit METCorrectionAlgorithm(const edm::ParameterSet&, edm::ConsumesCollector&& iConsumesCollector);
   ~METCorrectionAlgorithm();
 
-  CorrMETData compMETCorrection(edm::Event&, const edm::EventSetup&);
+  CorrMETData compMETCorrection(edm::Event&);
 
 private:
   typedef std::vector<edm::InputTag> vInputTag;

JetMETCorrections/Type1MET/plugins/CorrectedCaloMETProducer.cc

@@ -49,7 +49,7 @@ class CorrectedCaloMETProducer : public edm::stream::EDProducer<> {
 
     const reco::CaloMET& srcMET = (*srcMETCollection)[0];
 
-    reco::CaloMET outMET = corrector.getCorrectedCaloMET(srcMET, evt, es);
+    reco::CaloMET outMET = corrector.getCorrectedCaloMET(srcMET, evt);
 
     std::unique_ptr<METCollection> product(new METCollection);
     product->push_back(outMET);

JetMETCorrections/Type1MET/plugins/CorrectedPFMETProducer.cc

@@ -62,7 +62,7 @@ class CorrectedPFMETProducer : public edm::stream::EDProducer<> {
 
     const reco::PFMET& srcMET = (*srcMETCollection)[0];
 
-    reco::PFMET outMET = corrector.getCorrectedPFMET(srcMET, evt, es);
+    reco::PFMET outMET = corrector.getCorrectedPFMET(srcMET, evt);
 
     std::unique_ptr<METCollection> product(new METCollection);
     product->push_back(outMET);

JetMETCorrections/Type1MET/plugins/CorrectedPatMETProducer.cc

@@ -70,13 +70,13 @@ class CorrectedPatMETProducer : public edm::stream::EDProducer<> {
       //std::unique_ptr<patMETCollection> product(new patMETCollection);
       std::unique_ptr<patMETCollection> product(new patMETCollection);
       const reco::MET& srcMET = (*srcPatMETCollection)[0];
-      pat::MET outMEtPat = corrector.getCorrectedMET(srcMET, evt, es);
+      pat::MET outMEtPat = corrector.getCorrectedMET(srcMET, evt);
       product->push_back(outMEtPat);
       evt.put(std::move(product));
     } else {
       std::unique_ptr<pfMETCollection> product(new pfMETCollection);
       const reco::PFMET& srcMET = (*srcPfMETCollection)[0];
-      reco::PFMET outPfMEtReco = corrector.getCorrectedPFMET(srcMET, evt, es);
+      reco::PFMET outPfMEtReco = corrector.getCorrectedPFMET(srcMET, evt);
       product->push_back(outPfMEtReco);
       evt.put(std::move(product));
     }

JetMETCorrections/Type1MET/plugins/MultShiftMETcorrDBInputProducer.cc

@@ -2,9 +2,7 @@
 
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "CondFormats/JetMETObjects/interface/MEtXYcorrectParameters.h"
 #include "CondFormats/JetMETObjects/interface/Utilities.h"
-#include "JetMETCorrections/Objects/interface/MEtXYcorrectRecord.h"
 
 #include "DataFormats/METReco/interface/CorrMETData.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
@@ -43,6 +41,8 @@ MultShiftMETcorrDBInputProducer::MultShiftMETcorrDBInputProducer(const edm::Para
 
   pflow_ = consumes<edm::View<reco::Candidate>>(cfg.getParameter<edm::InputTag>("srcPFlow"));
   vertices_ = consumes<edm::View<reco::Vertex>>(cfg.getParameter<edm::InputTag>("vertexCollection"));
+  mMEtXYcorParaColl_ =
+      esConsumes<MEtXYcorrectParametersCollection, MEtXYcorrectRecord>(edm::ESInputTag("", mPayloadName));
 
   edm::InputTag srcWeights = cfg.getParameter<edm::InputTag>("srcWeights");
   if (!srcWeights.label().empty())
@@ -58,8 +58,7 @@ MultShiftMETcorrDBInputProducer::~MultShiftMETcorrDBInputProducer() {}
 
 void MultShiftMETcorrDBInputProducer::produce(edm::Event& evt, const edm::EventSetup& es) {
   // Get para.s from DB
-  edm::ESHandle<MEtXYcorrectParametersCollection> MEtXYcorParaColl;
-  es.get<MEtXYcorrectRecord>().get(mPayloadName, MEtXYcorParaColl);
+  edm::ESHandle<MEtXYcorrectParametersCollection> MEtXYcorParaColl = es.getHandle(mMEtXYcorParaColl_);
 
   // get the sections from Collection (pair of section and METCorr.Par class)
   std::vector<MEtXYcorrectParametersCollection::key_type> keys;

JetMETCorrections/Type1MET/plugins/MultShiftMETcorrDBInputProducer.h

@@ -18,12 +18,15 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
 #include "DataFormats/Common/interface/ValueMap.h"
 
 #include "DataFormats/METReco/interface/MET.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
+#include "CondFormats/JetMETObjects/interface/MEtXYcorrectParameters.h"
+#include "JetMETCorrections/Objects/interface/MEtXYcorrectRecord.h"
 
 #include <TF1.h>
 
@@ -41,6 +44,7 @@ class MultShiftMETcorrDBInputProducer : public edm::stream::EDProducer<> {
 
   edm::EDGetTokenT<edm::View<reco::Candidate>> pflow_;
   edm::EDGetTokenT<edm::View<reco::Vertex>> vertices_;
+  edm::ESGetToken<MEtXYcorrectParametersCollection, MEtXYcorrectRecord> mMEtXYcorParaColl_;
   std::string moduleLabel_;
   std::string mPayloadName;
   std::string mSampleType;

JetMETCorrections/Type1MET/src/AddCorrectionsToGenericMET.cc

@@ -12,9 +12,7 @@ reco::Candidate::LorentzVector AddCorrectionsToGenericMET::constructP4From(const
   return reco::Candidate::LorentzVector(px, py, 0., pt);
 }
 
-CorrMETData AddCorrectionsToGenericMET::getCorrection(const reco::MET& srcMET,
-                                                      edm::Event& evt,
-                                                      const edm::EventSetup& es) {
+CorrMETData AddCorrectionsToGenericMET::getCorrection(const reco::MET& srcMET, edm::Event& evt) {
   CorrMETData sumCor;
   edm::Handle<CorrMETData> corr;
   for (std::vector<edm::EDGetTokenT<CorrMETData> >::const_iterator corrToken = corrTokens_.begin();
@@ -27,20 +25,16 @@ CorrMETData AddCorrectionsToGenericMET::getCorrection(const reco::MET& srcMET,
   return sumCor;
 }
 
-reco::MET AddCorrectionsToGenericMET::getCorrectedMET(const reco::MET& srcMET,
-                                                      edm::Event& evt,
-                                                      const edm::EventSetup& es) {
-  CorrMETData corr = getCorrection(srcMET, evt, es);
+reco::MET AddCorrectionsToGenericMET::getCorrectedMET(const reco::MET& srcMET, edm::Event& evt) {
+  CorrMETData corr = getCorrection(srcMET, evt);
   reco::MET outMET(srcMET.sumEt() + corr.sumet, constructP4From(srcMET, corr), srcMET.vertex(), srcMET.isWeighted());
 
   return outMET;
 }
 
 //specific flavors ================================
-reco::PFMET AddCorrectionsToGenericMET::getCorrectedPFMET(const reco::PFMET& srcMET,
-                                                          edm::Event& evt,
-                                                          const edm::EventSetup& es) {
-  CorrMETData corr = getCorrection(srcMET, evt, es);
+reco::PFMET AddCorrectionsToGenericMET::getCorrectedPFMET(const reco::PFMET& srcMET, edm::Event& evt) {
+  CorrMETData corr = getCorrection(srcMET, evt);
   reco::PFMET outMET(srcMET.getSpecific(),
                      srcMET.sumEt() + corr.sumet,
                      constructP4From(srcMET, corr),
@@ -50,10 +44,8 @@ reco::PFMET AddCorrectionsToGenericMET::getCorrectedPFMET(const reco::PFMET& src
   return outMET;
 }
 
-reco::CaloMET AddCorrectionsToGenericMET::getCorrectedCaloMET(const reco::CaloMET& srcMET,
-                                                              edm::Event& evt,
-                                                              const edm::EventSetup& es) {
-  CorrMETData corr = getCorrection(srcMET, evt, es);
+reco::CaloMET AddCorrectionsToGenericMET::getCorrectedCaloMET(const reco::CaloMET& srcMET, edm::Event& evt) {
+  CorrMETData corr = getCorrection(srcMET, evt);
   reco::CaloMET outMET(
       srcMET.getSpecific(), srcMET.sumEt() + corr.sumet, constructP4From(srcMET, corr), srcMET.vertex());
 

JetMETCorrections/Type1MET/src/METCorrectionAlgorithm.cc

@@ -68,7 +68,7 @@ METCorrectionAlgorithm::~METCorrectionAlgorithm() {
   }
 }
 
-CorrMETData METCorrectionAlgorithm::compMETCorrection(edm::Event& evt, const edm::EventSetup& es) {
+CorrMETData METCorrectionAlgorithm::compMETCorrection(edm::Event& evt) {
   CorrMETData metCorr;
   metCorr.mex = 0.;
   metCorr.mey = 0.;

PhysicsTools/PatUtils/plugins/CorrectedPATMETProducer.cc

@@ -52,7 +52,7 @@ class CorrectedPATMETProducer : public edm::stream::EDProducer<> {
     const pat::MET& srcMET = (*srcMETCollection)[0];
 
     //dispatching to be sure we retrieve all the informations
-    reco::MET corrMET = corrector.getCorrectedMET(srcMET, evt, es);
+    reco::MET corrMET = corrector.getCorrectedMET(srcMET, evt);
     pat::MET outMET(corrMET, srcMET);
 
     auto product = std::make_unique<METCollection>();