Merge pull request #30284 from JamminJones/fixGeneratorInterfaceHiGen…

…Common

added esConsumes to modules in GeneratorInterface/HiGenCommon

GeneratorInterface/HiGenCommon/plugins/GenHIEventProducer.cc

@@ -28,6 +28,7 @@ Description: <one line class summary>
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -54,6 +55,7 @@ class GenHIEventProducer : public edm::EDProducer {
   void produce(edm::Event&, const edm::EventSetup&) override;
   edm::EDGetTokenT<CrossingFrame<edm::HepMCProduct> > hepmcSrc_;
   edm::ESHandle<ParticleDataTable> pdt;
+  edm::ESGetToken<ParticleDataTable, edm::DefaultRecord> pdtToken_;
 
   double ptCut_;
   bool doParticleInfo_;
@@ -73,6 +75,7 @@ class GenHIEventProducer : public edm::EDProducer {
 GenHIEventProducer::GenHIEventProducer(const edm::ParameterSet& iConfig) {
   produces<edm::GenHIEvent>();
   hepmcSrc_ = consumes<CrossingFrame<edm::HepMCProduct> >(iConfig.getParameter<edm::InputTag>("src"));
+  pdtToken_ = esConsumes<ParticleDataTable, edm::DefaultRecord>();
   doParticleInfo_ = iConfig.getUntrackedParameter<bool>("doParticleInfo", false);
   if (doParticleInfo_) {
     ptCut_ = iConfig.getParameter<double>("ptCut");
@@ -92,8 +95,9 @@ GenHIEventProducer::~GenHIEventProducer() {
 void GenHIEventProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
 
-  if (!(pdt.isValid()))
-    iSetup.getData(pdt);
+  if (!(pdt.isValid())) {
+    pdt = iSetup.getHandle(pdtToken_);
+  }
 
   double b = -1;
   int npart = -1;

GeneratorInterface/HiGenCommon/plugins/HighMultiplicityGenFilter.cc

@@ -26,6 +26,7 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
@@ -44,7 +45,7 @@ class HighMultiplicityGenFilter : public edm::EDFilter {
   void endJob() override;
 
   // ----------member data ---------------------------
-  edm::ESHandle<ParticleDataTable> pdt;
+  edm::ESGetToken<ParticleDataTable, edm::DefaultRecord> pdtToken_;
   edm::EDGetTokenT<edm::HepMCProduct> hepmcSrc;
   double etaMax;
   double ptMin;
@@ -64,7 +65,8 @@ class HighMultiplicityGenFilter : public edm::EDFilter {
 // constructors and destructor
 //
 HighMultiplicityGenFilter::HighMultiplicityGenFilter(const edm::ParameterSet& iConfig)
-    : hepmcSrc(consumes<edm::HepMCProduct>(iConfig.getParameter<edm::InputTag>("generatorSmeared"))),
+    : pdtToken_(esConsumes<ParticleDataTable, edm::DefaultRecord>()),
+      hepmcSrc(consumes<edm::HepMCProduct>(iConfig.getParameter<edm::InputTag>("generatorSmeared"))),
       etaMax(iConfig.getUntrackedParameter<double>("etaMax")),
       ptMin(iConfig.getUntrackedParameter<double>("ptMin")),
       nMin(iConfig.getUntrackedParameter<int>("nMin")) {
@@ -86,8 +88,7 @@ bool HighMultiplicityGenFilter::filter(edm::Event& iEvent, const edm::EventSetup
   bool accepted = false;
   edm::Handle<edm::HepMCProduct> evt;
   iEvent.getByToken(hepmcSrc, evt);
-
-  iSetup.getData(pdt);
+  edm::ESHandle<ParticleDataTable> pdt = iSetup.getHandle(pdtToken_);
 
   const HepMC::GenEvent* myGenEvent = evt->GetEvent();