Replace SeedingLayersESProducer with an EDProducer

Calibration/HcalIsolatedTrackReco/python/HITmixedPairRegGenerator_cfi.py

@@ -3,7 +3,7 @@
 HITmixedPairRegGenerator = cms.EDProducer("SeedGeneratorFromRegionHitsEDProducer",
     OrderedHitsFactoryPSet = cms.PSet(
         ComponentName = cms.string('StandardHitPairGenerator'),
-        SeedingLayers = cms.string('MixedLayerPairs')
+        SeedingLayers = cms.InputTag('MixedLayerPairs')
     ),
     SeedComparitorPSet = cms.PSet(
         ComponentName = cms.string('none')

Calibration/HcalIsolatedTrackReco/python/HITpixelPairRegGenerator_cfi.py

@@ -3,7 +3,7 @@
 HITpixelPairRegGenerator = cms.EDProducer("SeedGeneratorFromRegionHitsEDProducer",
     OrderedHitsFactoryPSet = cms.PSet(
         ComponentName = cms.string('StandardHitPairGenerator'),
-        SeedingLayers = cms.string('PixelLayerPairs')
+        SeedingLayers = cms.InputTag('PixelLayerPairs')
     ),
     SeedComparitorPSet = cms.PSet(
         ComponentName = cms.string('none')

Calibration/HcalIsolatedTrackReco/python/HITpixelTripletRegGenerator_cfi.py

@@ -4,7 +4,7 @@
 HITpixelTripletRegGenerator = cms.EDProducer("SeedGeneratorFromRegionHitsEDProducer",
     OrderedHitsFactoryPSet = cms.PSet(
         ComponentName = cms.string('StandardHitTripletGenerator'),
-        SeedingLayers = cms.string('PixelLayerTriplets'),
+        SeedingLayers = cms.InputTag('PixelLayerTriplets'),
         PixelTripletHLTGenerator = cms.PSet(
             useBending = cms.bool(True),
             useFixedPreFiltering = cms.bool(False),

FastSimulation/Tracking/python/IterativeDetachedTripletStep_cff.py

@@ -30,8 +30,8 @@
 #                                   'BPix1+BPix2+FPix1_neg',
 #                                   'BPix1+FPix1_pos+FPix2_pos',
 #                                   'BPix1+FPix1_neg+FPix2_neg']
-from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
-iterativeDetachedTripletSeeds.layerList = pixellayertriplets.layerList
+from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
+iterativeDetachedTripletSeeds.layerList = PixelLayerTriplets.layerList
 
 # candidate producer
 #from FastSimulation.Tracking.IterativeSecondCandidateProducer_cff import *

FastSimulation/Tracking/python/IterativeInitialStep_cff.py

@@ -29,8 +29,8 @@
 #                                   'BPix1+BPix2+FPix1_neg',
 #                                   'BPix1+FPix1_pos+FPix2_pos',
 #                                   'BPix1+FPix1_neg+FPix2_neg']
-from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
-iterativeInitialSeeds.layerList = pixellayertriplets.layerList
+from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
+iterativeInitialSeeds.layerList = PixelLayerTriplets.layerList
 
 # candidate producer
 import FastSimulation.Tracking.TrackCandidateProducer_cfi

FastSimulation/Tracking/python/IterativeLowPtTripletStep_cff.py

@@ -29,8 +29,8 @@
 #                                   'BPix1+BPix2+FPix1_neg',
 #                                   'BPix1+FPix1_pos+FPix2_pos',
 #                                   'BPix1+FPix1_neg+FPix2_neg']
-from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
-iterativeLowPtTripletSeeds.layerList = pixellayertriplets.layerList
+from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
+iterativeLowPtTripletSeeds.layerList = PixelLayerTriplets.layerList
 
 # candidate producer
 import FastSimulation.Tracking.TrackCandidateProducer_cfi

FastSimulation/Tracking/python/PixelTripletSeedProducer_cff.py

@@ -17,5 +17,5 @@
 #                               'BPix1+BPix2+FPix1_neg',
 #                               'BPix1+FPix1_pos+FPix2_pos',
 #                               'BPix1+FPix1_neg+FPix2_neg']
-from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
-pixelTripletSeeds.layerList = pixellayertriplets.layerList
+from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
+pixelTripletSeeds.layerList = PixelLayerTriplets.layerList

RecoEgamma/EgammaElectronAlgos/interface/SeedFilter.h

@@ -24,6 +24,7 @@
 
 class SeedGeneratorFromRegionHits;
 class MagneticField;
+namespace edm { class ConsumesCollector; }
 
 class SeedFilter {
  public:
@@ -34,7 +35,8 @@ class SeedFilter {
   };
 
   SeedFilter(const edm::ParameterSet& conf,
-	     const Tokens& tokens);
+	     const Tokens& tokens,
+	     edm::ConsumesCollector& iC);
   ~SeedFilter();
 
   void seeds(edm::Event&, const edm::EventSetup&, const reco::SuperClusterRef &, TrajectorySeedCollection *);

RecoEgamma/EgammaElectronAlgos/src/SeedFilter.cc

@@ -32,7 +32,8 @@ using namespace std;
 using namespace reco;
 
 SeedFilter::SeedFilter(const edm::ParameterSet& conf,
-		       const SeedFilter::Tokens& tokens)
+		       const SeedFilter::Tokens& tokens,
+		       edm::ConsumesCollector& iC)
  {
   edm::LogInfo("EtaPhiRegionSeedFactory") << "Enter the EtaPhiRegionSeedFactory";
   edm::ParameterSet regionPSet = conf.getParameter<edm::ParameterSet>("RegionPSet");
@@ -56,7 +57,7 @@ SeedFilter::SeedFilter(const edm::ParameterSet& conf,
   hitsfactoryMode_ = hitsfactoryPSet.getUntrackedParameter<int>("useOnDemandTracker");
 
   // get orderd hits generator from factory
-  OrderedHitsGenerator*  hitsGenerator = OrderedHitsGeneratorFactory::get()->create(hitsfactoryName, hitsfactoryPSet);
+  OrderedHitsGenerator*  hitsGenerator = OrderedHitsGeneratorFactory::get()->create(hitsfactoryName, hitsfactoryPSet, iC);
 
   // start seed generator
   // FIXME??

RecoEgamma/EgammaElectronProducers/plugins/ElectronSeedProducer.cc

@@ -40,6 +40,7 @@
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -49,7 +50,7 @@ using namespace reco ;
 
 ElectronSeedProducer::ElectronSeedProducer( const edm::ParameterSet& iConfig )
  : //conf_(iConfig),
-   seedFilter_(0), applyHOverECut_(true), hcalHelper_(0),
+   applyHOverECut_(true), hcalHelper_(0),
    caloGeom_(0), caloGeomCacheId_(0), caloTopo_(0), caloTopoCacheId_(0)
  {
   conf_ = iConfig.getParameter<edm::ParameterSet>("SeedConfiguration") ;
@@ -115,27 +116,30 @@ ElectronSeedProducer::ElectronSeedProducer( const edm::ParameterSet& iConfig )
   superClusters_[1]=
     consumes<reco::SuperClusterCollection>(iConfig.getParameter<edm::InputTag>("endcapSuperClusters")) ;
 
-  //register your products
-  produces<ElectronSeedCollection>() ;
-}
-
-
-void ElectronSeedProducer::beginRun(edm::Run const&, edm::EventSetup const&) {
+  // Construction of SeedFilter was in beginRun() with the comment
+  // below, but it has to be done here because of ConsumesCollector
+  //
   // FIXME: because of a bug presumably in tracker seeding,
   // perhaps in CombinedHitPairGenerator, badly caching some EventSetup product,
   // we must redo the SeedFilter for each run.
   if (prefilteredSeeds_) {
     SeedFilter::Tokens sf_tokens;
     sf_tokens.token_bs  = beamSpotTag_;
     sf_tokens.token_vtx = filterVtxTag_;
-    seedFilter_ = new SeedFilter(conf_,sf_tokens) ;
+    edm::ConsumesCollector iC = consumesCollector();
+    seedFilter_.reset(new SeedFilter(conf_, sf_tokens, iC));
   }
+
+  //register your products
+  produces<ElectronSeedCollection>() ;
+}
+
+
+void ElectronSeedProducer::beginRun(edm::Run const&, edm::EventSetup const&) {
 }
 
 void ElectronSeedProducer::endRun(edm::Run const&, edm::EventSetup const&)
  {
-  delete seedFilter_ ;
-  seedFilter_ = 0 ;
  }
 
 ElectronSeedProducer::~ElectronSeedProducer()

RecoEgamma/EgammaElectronProducers/plugins/ElectronSeedProducer.h

@@ -67,7 +67,7 @@ class ElectronSeedProducer : public edm::EDProducer
 
     edm::ParameterSet conf_ ;
     ElectronSeedGenerator * matcher_ ;
-    SeedFilter * seedFilter_;
+    std::unique_ptr<SeedFilter> seedFilter_;
 
     TrajectorySeedCollection * theInitialSeedColl ;
 

RecoEgamma/EgammaHLTProducers/interface/EgammaHLTRegionalPixelSeedGeneratorProducers.h

@@ -43,8 +43,7 @@ class EgammaHLTRegionalPixelSeedGeneratorProducers : public edm::EDProducer
 
 
  private:
-  edm::ParameterSet conf_;
-  SeedGeneratorFromRegionHits *combinatorialSeedGenerator;
+  std::unique_ptr<SeedGeneratorFromRegionHits> combinatorialSeedGenerator;
   double ptmin_;
   double vertexz_;
   double originradius_;

RecoEgamma/EgammaHLTProducers/src/EgammaHLTRegionalPixelSeedGeneratorProducers.cc

@@ -15,6 +15,7 @@
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
@@ -39,24 +40,38 @@
 using namespace std;
 using namespace reco;
 
-EgammaHLTRegionalPixelSeedGeneratorProducers::EgammaHLTRegionalPixelSeedGeneratorProducers(edm::ParameterSet const& conf) :   conf_(conf),combinatorialSeedGenerator(0)
+EgammaHLTRegionalPixelSeedGeneratorProducers::EgammaHLTRegionalPixelSeedGeneratorProducers(edm::ParameterSet const& conf)
 {
 
   produces<TrajectorySeedCollection>();
 
-  ptmin_       = conf_.getParameter<double>("ptMin");
-  vertexz_     = conf_.getParameter<double>("vertexZ");
-  originradius_= conf_.getParameter<double>("originRadius");
-  halflength_  = conf_.getParameter<double>("originHalfLength");
-  deltaEta_    = conf_.getParameter<double>("deltaEtaRegion");
-  deltaPhi_    = conf_.getParameter<double>("deltaPhiRegion");
+  ptmin_       = conf.getParameter<double>("ptMin");
+  vertexz_     = conf.getParameter<double>("vertexZ");
+  originradius_= conf.getParameter<double>("originRadius");
+  halflength_  = conf.getParameter<double>("originHalfLength");
+  deltaEta_    = conf.getParameter<double>("deltaEtaRegion");
+  deltaPhi_    = conf.getParameter<double>("deltaPhiRegion");
 
-  candTag_     = consumes<reco::RecoEcalCandidateCollection>(conf_.getParameter< edm::InputTag > ("candTag"));
-  candTagEle_  = consumes<reco::ElectronCollection>(conf_.getParameter< edm::InputTag > ("candTagEle"));
+  candTag_     = consumes<reco::RecoEcalCandidateCollection>(conf.getParameter< edm::InputTag > ("candTag"));
+  candTagEle_  = consumes<reco::ElectronCollection>(conf.getParameter< edm::InputTag > ("candTagEle"));
   BSProducer_  = consumes<reco::BeamSpot>(conf.getParameter<edm::InputTag>("BSProducer"));
 
-  useZvertex_  = conf_.getParameter<bool>("UseZInVertex");
+  useZvertex_  = conf.getParameter<bool>("UseZInVertex");
 
+  edm::ParameterSet hitsfactoryPSet = conf.getParameter<edm::ParameterSet>("OrderedHitsFactoryPSet");
+  std::string hitsfactoryName = hitsfactoryPSet.getParameter<std::string>("ComponentName");
+
+  // get orderd hits generator from factory
+  edm::ConsumesCollector iC = consumesCollector();
+  OrderedHitsGenerator*  hitsGenerator = OrderedHitsGeneratorFactory::get()->create( hitsfactoryName, hitsfactoryPSet, iC);
+
+  // start seed generator
+  edm::ParameterSet creatorPSet;
+  creatorPSet.addParameter<std::string>("propagator","PropagatorWithMaterial");
+
+  combinatorialSeedGenerator.reset(new SeedGeneratorFromRegionHits( hitsGenerator, 0,
+                                                                    SeedCreatorFactory::get()->create("SeedFromConsecutiveHitsCreator", creatorPSet)
+                                                                    ));
   // setup orderedhits setup (in order to tell seed generator to use pairs/triplets, which layers)
 }
 
@@ -81,35 +96,18 @@ void EgammaHLTRegionalPixelSeedGeneratorProducers::fillDescriptions(edm::Configu
 
   edm::ParameterSetDescription orederedHitsPSET;
   orederedHitsPSET.add<std::string>("ComponentName", "StandardHitPairGenerator");
-  orederedHitsPSET.add<std::string>("SeedingLayers", "hltESPPixelLayerPairs");
+  orederedHitsPSET.add<edm::InputTag>("SeedingLayers", edm::InputTag("hltESPPixelLayerPairs"));
   orederedHitsPSET.add<unsigned int>("maxElement", 0);
   desc.add<edm::ParameterSetDescription>("OrderedHitsFactoryPSet", orederedHitsPSET);
 
   descriptions.add(("hltEgammaHLTRegionalPixelSeedGeneratorProducers"), desc);  
 }
 
-void EgammaHLTRegionalPixelSeedGeneratorProducers::endRun(edm::Run const&run, const edm::EventSetup& es)
-{
-  delete combinatorialSeedGenerator;
-  combinatorialSeedGenerator=0;
-}
+void EgammaHLTRegionalPixelSeedGeneratorProducers::endRun(edm::Run const&run, const edm::EventSetup& es) {}
 
 
 void EgammaHLTRegionalPixelSeedGeneratorProducers::beginRun(edm::Run const&run, const edm::EventSetup& es)
 {
-  edm::ParameterSet hitsfactoryPSet = conf_.getParameter<edm::ParameterSet>("OrderedHitsFactoryPSet");
-  std::string hitsfactoryName = hitsfactoryPSet.getParameter<std::string>("ComponentName");
-
-  // get orderd hits generator from factory
-  OrderedHitsGenerator*  hitsGenerator = OrderedHitsGeneratorFactory::get()->create( hitsfactoryName, hitsfactoryPSet);
-
-  // start seed generator
-  edm::ParameterSet creatorPSet;
-  creatorPSet.addParameter<std::string>("propagator","PropagatorWithMaterial");
-
-  combinatorialSeedGenerator = new SeedGeneratorFromRegionHits( hitsGenerator, 0, 
-								SeedCreatorFactory::get()->create("SeedFromConsecutiveHitsCreator", creatorPSet)
-								);
 }
 
 // Functions that gets called by framework every event

RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py

@@ -26,9 +26,7 @@
 )
 
 # SEEDING LAYERS
-hiRegitMuDetachedTripletStepSeedLayers =  RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepSeedLayers.clone(
-    ComponentName = 'hiRegitMuDetachedTripletStepSeedLayers'
-    )
+hiRegitMuDetachedTripletStepSeedLayers =  RecoHI.HiTracking.hiRegitDetachedTripletStep_cff.hiRegitDetachedTripletStepSeedLayers.clone()
 hiRegitMuDetachedTripletStepSeedLayers.BPix.skipClusters = cms.InputTag('hiRegitMuDetachedTripletStepClusters')
 hiRegitMuDetachedTripletStepSeedLayers.FPix.skipClusters = cms.InputTag('hiRegitMuDetachedTripletStepClusters')
 
@@ -86,6 +84,7 @@
 
 
 hiRegitMuonDetachedTripletStep = cms.Sequence(hiRegitMuDetachedTripletStepClusters*
+                                              hiRegitMuDetachedTripletStepSeedLayers*
                                               hiRegitMuDetachedTripletStepSeeds*
                                               hiRegitMuDetachedTripletStepTrackCandidates*
                                               hiRegitMuDetachedTripletStepTracks*

RecoHI/HiMuonAlgos/python/HiRegitMuonLowPtTripletStep_cff.py

@@ -23,9 +23,7 @@
 )
 
 # SEEDING LAYERS
-hiRegitMuLowPtTripletStepSeedLayers = RecoHI.HiTracking.hiRegitLowPtTripletStep_cff.hiRegitLowPtTripletStepSeedLayers.clone(
-    ComponentName = 'hiRegitMuLowPtTripletStepSeedLayers'
-    )
+hiRegitMuLowPtTripletStepSeedLayers = RecoHI.HiTracking.hiRegitLowPtTripletStep_cff.hiRegitLowPtTripletStepSeedLayers.clone()
 hiRegitMuLowPtTripletStepSeedLayers.BPix.skipClusters = cms.InputTag('hiRegitMuLowPtTripletStepClusters')
 hiRegitMuLowPtTripletStepSeedLayers.FPix.skipClusters = cms.InputTag('hiRegitMuLowPtTripletStepClusters')
 
@@ -90,6 +88,7 @@
 )
 
 hiRegitMuonLowPtTripletStep = cms.Sequence(hiRegitMuLowPtTripletStepClusters*
+                                           hiRegitMuLowPtTripletStepSeedLayers*
                                            hiRegitMuLowPtTripletStepSeeds*
                                            hiRegitMuLowPtTripletStepTrackCandidates*
                                            hiRegitMuLowPtTripletStepTracks*

RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py

@@ -26,9 +26,7 @@
 
 
 # SEEDING LAYERS A
-hiRegitMuMixedTripletStepSeedLayersA =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersA.clone(
-    ComponentName = 'hiRegitMuMixedTripletStepSeedLayersA'
-    )
+hiRegitMuMixedTripletStepSeedLayersA =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersA.clone()
 hiRegitMuMixedTripletStepSeedLayersA.BPix.skipClusters = cms.InputTag('hiRegitMuMixedTripletStepClusters')
 hiRegitMuMixedTripletStepSeedLayersA.FPix.skipClusters = cms.InputTag('hiRegitMuMixedTripletStepClusters')
 hiRegitMuMixedTripletStepSeedLayersA.TEC.skipClusters  = cms.InputTag('hiRegitMuMixedTripletStepClusters')
@@ -44,9 +42,7 @@
 hiRegitMuMixedTripletStepSeedsA.OrderedHitsFactoryPSet.SeedingLayers = 'hiRegitMuMixedTripletStepSeedLayersA'
 
 # SEEDING LAYERS B
-hiRegitMuMixedTripletStepSeedLayersB =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersB.clone(
-    ComponentName = 'hiRegitMuMixedTripletStepSeedLayersB',
-    )
+hiRegitMuMixedTripletStepSeedLayersB =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersB.clone()
 hiRegitMuMixedTripletStepSeedLayersB.BPix.skipClusters = cms.InputTag('hiRegitMuMixedTripletStepClusters')
 hiRegitMuMixedTripletStepSeedLayersB.TIB.skipClusters  = cms.InputTag('hiRegitMuMixedTripletStepClusters')
 
@@ -120,7 +116,9 @@
     ) #end of clone
 
 hiRegitMuonMixedTripletStep = cms.Sequence(hiRegitMuMixedTripletStepClusters*
+                                         hiRegitMuMixedTripletStepSeedLayersA*
                                          hiRegitMuMixedTripletStepSeedsA*
+                                         hiRegitMuMixedTripletStepSeedLayersB*
                                          hiRegitMuMixedTripletStepSeedsB*
                                          hiRegitMuMixedTripletStepSeeds*
                                          hiRegitMuMixedTripletStepTrackCandidates*

RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py

@@ -24,9 +24,7 @@
 )
 
 # SEEDING LAYERS
-hiRegitMuPixelLessStepSeedLayers =  RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepSeedLayers.clone(
-    ComponentName = 'hiRegitMuPixelLessStepSeedLayers',
-    )
+hiRegitMuPixelLessStepSeedLayers =  RecoTracker.IterativeTracking.PixelLessStep_cff.pixelLessStepSeedLayers.clone()
 hiRegitMuPixelLessStepSeedLayers.TIB.skipClusters = cms.InputTag('hiRegitMuPixelLessStepClusters')
 hiRegitMuPixelLessStepSeedLayers.TID.skipClusters = cms.InputTag('hiRegitMuPixelLessStepClusters')
 hiRegitMuPixelLessStepSeedLayers.TEC.skipClusters = cms.InputTag('hiRegitMuPixelLessStepClusters')
@@ -89,6 +87,7 @@
 )
 
 hiRegitMuonPixelLessStep = cms.Sequence(hiRegitMuPixelLessStepClusters*
+                                        hiRegitMuPixelLessStepSeedLayers*
                                         hiRegitMuPixelLessStepSeeds*
                                         hiRegitMuPixelLessStepTrackCandidates*
                                         hiRegitMuPixelLessStepTracks*

RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py

@@ -27,9 +27,7 @@
 
 
 # SEEDING LAYERS
-hiRegitMuPixelPairStepSeedLayers =   RecoHI.HiTracking.hiRegitPixelPairStep_cff.hiRegitPixelPairStepSeedLayers.clone(
-    ComponentName = 'hiRegitMuPixelPairStepSeedLayers'
-    )
+hiRegitMuPixelPairStepSeedLayers =   RecoHI.HiTracking.hiRegitPixelPairStep_cff.hiRegitPixelPairStepSeedLayers.clone()
 hiRegitMuPixelPairStepSeedLayers.BPix.skipClusters = cms.InputTag('hiRegitMuPixelPairStepClusters')
 hiRegitMuPixelPairStepSeedLayers.FPix.skipClusters = cms.InputTag('hiRegitMuPixelPairStepClusters')
 
@@ -95,6 +93,7 @@
     )
 
 hiRegitMuonPixelPairStep = cms.Sequence(hiRegitMuPixelPairStepClusters*
+                                        hiRegitMuPixelPairStepSeedLayers*
                                         hiRegitMuPixelPairStepSeeds*
                                         hiRegitMuPixelPairStepTrackCandidates*
                                         hiRegitMuPixelPairStepTracks*