Merge pull request #37201 from bsunanda/Run3-sim112

Run3-sim112 Take care of deprecated code in FastSimulation/ForwardDetectors
cms-sw · Mar 18, 2022 · 032221e · 032221e
2 parents 8294370 + 2f0d8e1
commit 032221e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/FastSimulation/ForwardDetectors/plugins/CastorFastClusterProducer.cc b/FastSimulation/ForwardDetectors/plugins/CastorFastClusterProducer.cc
@@ -28,7 +28,6 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -44,14 +43,14 @@
 
 // genCandidate particle includes
 #include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 
 #include "FastSimulation/ForwardDetectors/plugins/CastorFastClusterProducer.h"
 
 //
 // constructors and destructor
 //
-CastorFastClusterProducer::CastorFastClusterProducer(const edm::ParameterSet& iConfig) {
+CastorFastClusterProducer::CastorFastClusterProducer(const edm::ParameterSet& iConfig)
+    : tokGenPart_(consumes<reco::GenParticleCollection>(edm::InputTag{"genParticles"})) {
   //register your products
   produces<CastorClusterCollection>();
 
@@ -80,8 +79,7 @@ void CastorFastClusterProducer::produce(edm::Event& iEvent, const edm::EventSetu
 
   //cout << "entering event" << endl;
 
-  Handle<GenParticleCollection> genParticles;
-  iEvent.getByLabel("genParticles", genParticles);
+  const edm::Handle<reco::GenParticleCollection>& genParticles = iEvent.getHandle(tokGenPart_);
 
   // make pointer to towers that will be made
   unique_ptr<CastorClusterCollection> CastorClusters(new CastorClusterCollection);

diff --git a/FastSimulation/ForwardDetectors/plugins/CastorFastClusterProducer.h b/FastSimulation/ForwardDetectors/plugins/CastorFastClusterProducer.h
@@ -2,12 +2,12 @@
 #define FastSimulation_ForwardDetectors_CastorFastClusterProducer_h
 
 #include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 // Castorobject includes
 #include "DataFormats/CastorReco/interface/CastorCluster.h"
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/Math/interface/Point3D.h"
 
 //
@@ -27,6 +27,7 @@ class CastorFastClusterProducer : public edm::stream::EDProducer<> {
   typedef math::XYZPointD Point;
   typedef ROOT::Math::RhoEtaPhiPoint ClusterPoint;
   typedef std::vector<reco::CastorCluster> CastorClusterCollection;
+  const edm::EDGetTokenT<reco::GenParticleCollection> tokGenPart_;
 };
 
 #endif
diff --git a/FastSimulation/ForwardDetectors/plugins/CastorFastTowerProducer.cc b/FastSimulation/ForwardDetectors/plugins/CastorFastTowerProducer.cc
@@ -28,7 +28,6 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -44,14 +43,14 @@
 
 // genCandidate particle includes
 #include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 
 #include "FastSimulation/ForwardDetectors/plugins/CastorFastTowerProducer.h"
 
 //
 // constructors and destructor
 //
-CastorFastTowerProducer::CastorFastTowerProducer(const edm::ParameterSet& iConfig) {
+CastorFastTowerProducer::CastorFastTowerProducer(const edm::ParameterSet& iConfig)
+    : tokGenPart_(consumes<reco::GenParticleCollection>(edm::InputTag{"genParticles"})) {
   //register your products
   produces<CastorTowerCollection>();
 
@@ -80,8 +79,7 @@ void CastorFastTowerProducer::produce(edm::Event& iEvent, const edm::EventSetup&
 
   //cout << "entering event" << endl;
 
-  Handle<GenParticleCollection> genParticles;
-  iEvent.getByLabel("genParticles", genParticles);
+  const edm::Handle<GenParticleCollection>& genParticles = iEvent.getHandle(tokGenPart_);
 
   // make pointer to towers that will be made
   unique_ptr<CastorTowerCollection> CastorTowers(new CastorTowerCollection);

diff --git a/FastSimulation/ForwardDetectors/plugins/CastorFastTowerProducer.h b/FastSimulation/ForwardDetectors/plugins/CastorFastTowerProducer.h
@@ -3,12 +3,12 @@
 
 // Castorobject includes
 #include "DataFormats/CastorReco/interface/CastorTower.h"
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
 #include "DataFormats/Math/interface/Point3D.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 
 #include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 //
 // class decleration
@@ -27,6 +27,7 @@ class CastorFastTowerProducer : public edm::stream::EDProducer<> {
   typedef math::XYZPointD Point;
   typedef ROOT::Math::RhoEtaPhiPoint TowerPoint;
   typedef std::vector<reco::CastorTower> CastorTowerCollection;
+  const edm::EDGetTokenT<reco::GenParticleCollection> tokGenPart_;
 };
 
 #endif