further clean-up

CalibTracker/SiStripCommon/interface/ShallowDigisProducer.h

@@ -1,13 +1,13 @@
 #ifndef SHALLOW_DIGIS_PRODUCER
 #define SHALLOW_DIGIS_PRODUCER
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 class SiStripNoises;
 
-class ShallowDigisProducer : public edm::EDProducer {
+class ShallowDigisProducer : public edm::stream::EDProducer<> {
 public:
   explicit ShallowDigisProducer(const edm::ParameterSet &);
 

CalibTracker/SiStripCommon/interface/ShallowEventDataProducer.h

@@ -1,18 +1,18 @@
 #ifndef SHALLOW_EVENTDATA_PRODUCER
 #define SHALLOW_EVENTDATA_PRODUCER
 
-#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 #include "DataFormats/Scalers/interface/LumiScalers.h"
 #include <string>
 
-class ShallowEventDataProducer : public edm::global::EDProducer<> {
+class ShallowEventDataProducer : public edm::stream::EDProducer<> {
 public:
-  explicit ShallowEventDataProducer(const edm::ParameterSet &);
+  explicit ShallowEventDataProducer(const edm::ParameterSet&);
 
 private:
-  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
+  void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
   edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> trig_token_;
   edm::EDGetTokenT<LumiScalersCollection> scalerToken_;
 };

CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h

@@ -48,7 +48,6 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
-#include "FWCore/Utilities/interface/ReusableObjectHolder.h"
 
 using DetIdMap = std::map<uint32_t, double>;
 

CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h

@@ -1,7 +1,7 @@
 #ifndef SHALLOW_RECHITCLUSTERS_PRODUCER
 #define SHALLOW_RECHITCLUSTERS_PRODUCER
 
-#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
@@ -10,17 +10,17 @@
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
-class ShallowRechitClustersProducer : public edm::global::EDProducer<> {
+class ShallowRechitClustersProducer : public edm::stream::EDProducer<> {
 public:
-  explicit ShallowRechitClustersProducer(const edm::ParameterSet &);
+  explicit ShallowRechitClustersProducer(const edm::ParameterSet&);
 
 private:
   std::string Suffix;
   std::string Prefix;
   const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken_;
   const edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster> > clusters_token_;
   std::vector<edm::EDGetTokenT<SiStripRecHit2DCollection> > rec_hits_tokens_;
-  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
+  void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
 };
 
 #endif

CalibTracker/SiStripCommon/interface/ShallowSimTracksProducer.h

@@ -0,0 +1,24 @@
+#ifndef SHALLOW_SIMTRACKS_PRODUCER
+#define SHALLOW_SIMTRACKS_PRODUCER
+
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include "DataFormats/Common/interface/DetSetVectorNew.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
+#include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
+
+class ShallowSimTracksProducer : public edm::stream::EDProducer<> {
+public:
+  explicit ShallowSimTracksProducer(const edm::ParameterSet&);
+
+private:
+  const std::string Prefix;
+  const std::string Suffix;
+  const edm::EDGetTokenT<TrackingParticleCollection> trackingParticles_token_;
+  const edm::EDGetTokenT<reco::TrackToTrackingParticleAssociator> associator_token_;
+  const edm::EDGetTokenT<edm::View<reco::Track> > tracks_token_;
+  void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
+};
+#endif

CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h

@@ -1,22 +1,30 @@
 #ifndef SHALLOW_SIMHITCLUSTERS_PRODUCER
 #define SHALLOW_SIMHITCLUSTERS_PRODUCER
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "CalibTracker/SiStripCommon/interface/ShallowTools.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h"
+#include "CondFormats/DataRecord/interface/SiStripLorentzAngleRcd.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
-class ShallowSimhitClustersProducer : public edm::EDProducer {
+class ShallowSimhitClustersProducer : public edm::stream::EDProducer<> {
 public:
   explicit ShallowSimhitClustersProducer(const edm::ParameterSet&);
 
 private:
-  //std::vector<edm::InputTag> inputTags;
   std::vector<edm::EDGetTokenT<std::vector<PSimHit> > > simhits_tokens_;
   const edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster> > clusters_token_;
+  const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken_;
+  const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magFieldToken_;
+  const edm::ESGetToken<SiStripLorentzAngle, SiStripLorentzAngleRcd> laToken_;
   std::string Prefix;
   std::string runningmode_;
 

CalibTracker/SiStripCommon/interface/ShallowTrackClustersProducer.h

@@ -1,22 +1,32 @@
 #ifndef SHALLOW_TRACKCLUSTERS_PRODUCER
 #define SHALLOW_TRACKCLUSTERS_PRODUCER
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h"
+#include "CondFormats/DataRecord/interface/SiStripLorentzAngleRcd.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "CalibTracker/Records/interface/SiStripDependentRecords.h"
 
-class ShallowTrackClustersProducer : public edm::EDProducer {
+class ShallowTrackClustersProducer : public edm::stream::EDProducer<> {
 public:
   explicit ShallowTrackClustersProducer(const edm::ParameterSet &);
 
 private:
   const edm::EDGetTokenT<edm::View<reco::Track> > tracks_token_;
   const edm::EDGetTokenT<TrajTrackAssociationCollection> association_token_;
   const edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster> > clusters_token_;
+  const edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> geomToken_;
+  const edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> magFieldToken_;
+  const edm::ESGetToken<SiStripLorentzAngle, SiStripLorentzAngleDepRcd> laToken_;
   std::string Suffix;
   std::string Prefix;
 

CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h

@@ -1,15 +1,15 @@
 #ifndef SHALLOW_TRACKS_PRODUCER
 #define SHALLOW_TRACKS_PRODUCER
 
-#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 
-class ShallowTracksProducer : public edm::global::EDProducer<> {
+class ShallowTracksProducer : public edm::stream::EDProducer<> {
 public:
-  explicit ShallowTracksProducer(const edm::ParameterSet &);
-  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
+  explicit ShallowTracksProducer(const edm::ParameterSet&);
+  void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
 
 private:
   const edm::EDGetTokenT<edm::View<reco::Track> > tracks_token_;

CalibTracker/SiStripCommon/plugins/ShallowClustersProducer.cc

@@ -6,7 +6,7 @@
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
@@ -15,14 +15,14 @@
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 #include "RecoLocalTracker/SiStripClusterizer/interface/SiStripClusterInfo.h"
 
-class ShallowClustersProducer : public edm::EDProducer {
+class ShallowClustersProducer : public edm::stream::EDProducer<> {
 public:
   explicit ShallowClustersProducer(const edm::ParameterSet&);
 
 private:
   edm::InputTag theClustersLabel;
   std::string Prefix;
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
 
   struct moduleVars {
     moduleVars(uint32_t, const TrackerTopology*);
@@ -40,6 +40,7 @@ class ShallowClustersProducer : public edm::EDProducer {
     float outsideasymm() const { return (last - first) / (last + first); }
   };
 
+  const edm::ESGetToken<TrackerTopology, TrackerTopologyRcd> topoToken_;
   edm::EDGetTokenT<edmNew::DetSetVector<SiStripCluster>> theClustersToken_;
   edm::EDGetTokenT<edm::DetSetVector<SiStripProcessedRawDigi>> theDigisToken_;
   SiStripClusterInfo siStripClusterInfo_;
@@ -49,7 +50,9 @@ class ShallowClustersProducer : public edm::EDProducer {
 DEFINE_FWK_MODULE(ShallowClustersProducer);
 
 ShallowClustersProducer::ShallowClustersProducer(const edm::ParameterSet& iConfig)
-    : Prefix(iConfig.getParameter<std::string>("Prefix")), siStripClusterInfo_(consumesCollector()) {
+    : Prefix(iConfig.getParameter<std::string>("Prefix")),
+      topoToken_(esConsumes<TrackerTopology, TrackerTopologyRcd>()),
+      siStripClusterInfo_(consumesCollector()) {
   produces<std::vector<unsigned>>(Prefix + "number");
   produces<std::vector<unsigned>>(Prefix + "width");
   produces<std::vector<float>>(Prefix + "variance");
@@ -93,8 +96,7 @@ ShallowClustersProducer::ShallowClustersProducer(const edm::ParameterSet& iConfi
 
 void ShallowClustersProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //Retrieve tracker topology from geometry
-  edm::ESHandle<TrackerTopology> tTopoHandle;
-  iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
+  edm::ESHandle<TrackerTopology> tTopoHandle = iSetup.getHandle(topoToken_);
   const TrackerTopology* const tTopo = tTopoHandle.product();
 
   siStripClusterInfo_.initEvent(iSetup);

CalibTracker/SiStripCommon/plugins/ShallowEventDataProducer.cc

@@ -22,7 +22,7 @@ ShallowEventDataProducer::ShallowEventDataProducer(const edm::ParameterSet& iCon
   scalerToken_ = consumes<LumiScalersCollection>(iConfig.getParameter<edm::InputTag>("lumiScalers"));
 }
 
-void ShallowEventDataProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
+void ShallowEventDataProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   auto run = std::make_unique<unsigned int>(iEvent.id().run());
   auto event = std::make_unique<unsigned int>(iEvent.id().event());
   auto bx = std::make_unique<unsigned int>(iEvent.bunchCrossing());

CalibTracker/SiStripCommon/plugins/ShallowRechitClustersProducer.cc

@@ -29,7 +29,7 @@ ShallowRechitClustersProducer::ShallowRechitClustersProducer(const edm::Paramete
   produces<std::vector<float>>(Prefix + "globalz" + Suffix);
 }
 
-void ShallowRechitClustersProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
+void ShallowRechitClustersProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   shallow::CLUSTERMAP clustermap = shallow::make_cluster_map(iEvent, clusters_token_);
 
   int size = clustermap.size();

CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc

@@ -30,7 +30,7 @@ ShallowSimTracksProducer::ShallowSimTracksProducer(const edm::ParameterSet& conf
   produces<std::vector<double>>(Prefix + "vz" + Suffix);
 }
 
-void ShallowSimTracksProducer::produce(edm::StreamID, edm::Event& event, const edm::EventSetup& iSetup) const {
+void ShallowSimTracksProducer::produce(edm::Event& event, const edm::EventSetup& iSetup) {
   edm::Handle<edm::View<reco::Track>> tracks;
   event.getByToken(tracks_token_, tracks);
   edm::Handle<TrackingParticleCollection> trackingParticles;

CalibTracker/SiStripCommon/plugins/ShallowSimhitClustersProducer.cc

@@ -2,13 +2,6 @@
 
 #include "CalibTracker/SiStripCommon/interface/ShallowTools.h"
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
-
-#include "MagneticField/Engine/interface/MagneticField.h"
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h"
-#include "CondFormats/DataRecord/interface/SiStripLorentzAngleRcd.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -17,6 +10,10 @@
 
 ShallowSimhitClustersProducer::ShallowSimhitClustersProducer(const edm::ParameterSet& iConfig)
     : clusters_token_(consumes<edmNew::DetSetVector<SiStripCluster>>(iConfig.getParameter<edm::InputTag>("Clusters"))),
+      geomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
+      magFieldToken_(esConsumes<MagneticField, IdealMagneticFieldRecord>()),
+      laToken_(esConsumes<SiStripLorentzAngle, SiStripLorentzAngleRcd>(
+          edm::ESInputTag(iConfig.getParameter<std::string>("runningMode")))),
       Prefix(iConfig.getParameter<std::string>("Prefix")),
       runningmode_(iConfig.getParameter<std::string>("runningMode")) {
   std::vector<edm::InputTag> simhits_tags = iConfig.getParameter<std::vector<edm::InputTag>>("InputTags");
@@ -55,12 +52,9 @@ void ShallowSimhitClustersProducer::produce(edm::Event& iEvent, const edm::Event
   auto particle = std::make_unique<std::vector<int>>(size, -500);
   auto process = std::make_unique<std::vector<unsigned short>>(size, 0);
 
-  edm::ESHandle<TrackerGeometry> theTrackerGeometry;
-  iSetup.get<TrackerDigiGeometryRecord>().get(theTrackerGeometry);
-  edm::ESHandle<MagneticField> magfield;
-  iSetup.get<IdealMagneticFieldRecord>().get(magfield);
-  edm::ESHandle<SiStripLorentzAngle> SiStripLorentzAngle;
-  iSetup.get<SiStripLorentzAngleRcd>().get(runningmode_, SiStripLorentzAngle);
+  edm::ESHandle<TrackerGeometry> theTrackerGeometry = iSetup.getHandle(geomToken_);
+  edm::ESHandle<MagneticField> magfield = iSetup.getHandle(magFieldToken_);
+  edm::ESHandle<SiStripLorentzAngle> SiStripLorentzAngle = iSetup.getHandle(laToken_);
   edm::Handle<edmNew::DetSetVector<SiStripCluster>> clusters;
   iEvent.getByLabel("siStripClusters", "", clusters);
 

CalibTracker/SiStripCommon/plugins/ShallowTrackClustersProducer.cc

@@ -7,26 +7,21 @@
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h"
-
-#include "MagneticField/Engine/interface/MagneticField.h"
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h"
-#include "CondFormats/DataRecord/interface/SiStripLorentzAngleRcd.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "CalibTracker/Records/interface/SiStripDependentRecords.h"
 #include <map>
 
 ShallowTrackClustersProducer::ShallowTrackClustersProducer(const edm::ParameterSet& iConfig)
     : tracks_token_(consumes<edm::View<reco::Track>>(iConfig.getParameter<edm::InputTag>("Tracks"))),
       association_token_(consumes<TrajTrackAssociationCollection>(iConfig.getParameter<edm::InputTag>("Tracks"))),
       clusters_token_(consumes<edmNew::DetSetVector<SiStripCluster>>(iConfig.getParameter<edm::InputTag>("Clusters"))),
+      geomToken_(esConsumes<TrackerGeometry, TrackerDigiGeometryRecord>()),
+      magFieldToken_(esConsumes<MagneticField, IdealMagneticFieldRecord>()),
+      laToken_(esConsumes<SiStripLorentzAngle, SiStripLorentzAngleDepRcd>()),
       Suffix(iConfig.getParameter<std::string>("Suffix")),
       Prefix(iConfig.getParameter<std::string>("Prefix")) {
   produces<std::vector<int>>(Prefix + "clusterIdx" + Suffix);          //link: on trk cluster --> general cluster info
@@ -154,12 +149,9 @@ void ShallowTrackClustersProducer::produce(edm::Event& iEvent, const edm::EventS
   auto globalZofunitlocalY = std::make_unique<std::vector<float>>();
   globalZofunitlocalY->reserve(size);
 
-  edm::ESHandle<TrackerGeometry> theTrackerGeometry;
-  iSetup.get<TrackerDigiGeometryRecord>().get(theTrackerGeometry);
-  edm::ESHandle<MagneticField> magfield;
-  iSetup.get<IdealMagneticFieldRecord>().get(magfield);
-  edm::ESHandle<SiStripLorentzAngle> SiStripLorentzAngle;
-  iSetup.get<SiStripLorentzAngleDepRcd>().get(SiStripLorentzAngle);
+  edm::ESHandle<TrackerGeometry> theTrackerGeometry = iSetup.getHandle(geomToken_);
+  edm::ESHandle<MagneticField> magfield = iSetup.getHandle(magFieldToken_);
+  edm::ESHandle<SiStripLorentzAngle> SiStripLorentzAngle = iSetup.getHandle(laToken_);
 
   edm::Handle<TrajTrackAssociationCollection> associations;
   iEvent.getByToken(association_token_, associations);

CalibTracker/SiStripCommon/plugins/ShallowTracksProducer.cc

@@ -38,7 +38,7 @@ ShallowTracksProducer::ShallowTracksProducer(const edm::ParameterSet& iConfig)
   produces<std::vector<int>>(Prefix + "algo" + Suffix);
 }
 
-void ShallowTracksProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
+void ShallowTracksProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   auto number = std::make_unique<unsigned int>(0);
   auto chi2 = std::make_unique<std::vector<double>>();
   auto ndof = std::make_unique<std::vector<double>>();