Merge pull request #40629 from jeongeun/remove-consumesMany

Migrate consumesMany() to edm::GetterOfProducts() in EgammaHLTExtraProducer

RecoEgamma/EgammaHLTProducers/plugins/EgammaHLTExtraProducer.cc

@@ -7,6 +7,8 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/Framework/interface/GetterOfProducts.h"
+#include "FWCore/Framework/interface/ProcessMatch.h"
 
 #include "DataFormats/HLTReco/interface/EgammaObject.h"
 #include "DataFormats/HLTReco/interface/EgammaObjectFwd.h"
@@ -183,6 +185,7 @@ class EgammaHLTExtraProducer : public edm::global::EDProducer<> {
   bool saveHitsPlusPi_;
   bool saveHitsPlusHalfPi_;
   std::vector<double> recHitCountThresholds_;
+  edm::GetterOfProducts<reco::RecoEcalCandidateIsolationMap> getterOfProducts_;
 };
 
 EgammaHLTExtraProducer::Tokens::Tokens(const edm::ParameterSet& pset, edm::ConsumesCollector&& cc) {
@@ -200,8 +203,8 @@ EgammaHLTExtraProducer::EgammaHLTExtraProducer(const edm::ParameterSet& pset)
       saveHitsPlusPi_(pset.getParameter<bool>("saveHitsPlusPi")),
       saveHitsPlusHalfPi_(pset.getParameter<bool>("saveHitsPlusHalfPi")),
       recHitCountThresholds_(pset.getParameter<std::vector<double>>("recHitCountThresholds")) {
-  consumesMany<reco::RecoEcalCandidateIsolationMap>();
-
+  getterOfProducts_ = edm::GetterOfProducts<reco::RecoEcalCandidateIsolationMap>(edm::ProcessMatch("*"), this);
+  callWhenNewProductsRegistered(getterOfProducts_);
   for (auto& tokenLabel : tokens_.egCands) {
     produces<trigger::EgammaObjectCollection>(tokenLabel.second);
   }
@@ -278,8 +281,7 @@ void EgammaHLTExtraProducer::produce(edm::StreamID streamID,
                                      edm::Event& event,
                                      const edm::EventSetup& eventSetup) const {
   std::vector<edm::Handle<reco::RecoEcalCandidateIsolationMap>> valueMapHandles;
-  event.getManyByType(valueMapHandles);
-
+  getterOfProducts_.fillHandles(event, valueMapHandles);
   std::vector<std::unique_ptr<trigger::EgammaObjectCollection>> egTrigObjColls;
   for (const auto& egCandsToken : tokens_.egCands) {
     auto ecalCandsHandle = event.getHandle(egCandsToken.first.ecalCands);