Merge pull request #3026 from makortel/specialSeedGenerators

Reco -- Migrate remaining SpecialSeedGenerators to SeedingLayerSetsHits

RecoTracker/Configuration/python/RecoTrackerBHM_cff.py

@@ -6,5 +6,5 @@
 from RecoTracker.CkfPattern.CkfTrackCandidatesBHM_cff import *
 #Final fit
 from RecoTracker.TrackProducer.CTFFinalFitWithMaterialBHM_cff import *
-beamhaloTracksSeq = cms.Sequence(beamhaloTrackerSeeds * beamhaloTrackCandidates * beamhaloTracks)
+beamhaloTracksSeq = cms.Sequence(beamhaloTrackerSeedingLayers * beamhaloTrackerSeeds * beamhaloTrackCandidates * beamhaloTracks)
 

RecoTracker/Configuration/python/RecoTrackerNotStandard_cff.py

@@ -40,4 +40,4 @@
     src = cms.InputTag( "regionalCosmicCkfTrackCandidates" ),
 )
 # Final Sequence
-regionalCosmicTracksSeq = cms.Sequence( regionalCosmicTrackerSeeds * regionalCosmicCkfTrackCandidates * regionalCosmicTracks )
+regionalCosmicTracksSeq = cms.Sequence( regionalCosmicTrackerSeedingLayers * regionalCosmicTrackerSeeds * regionalCosmicCkfTrackCandidates * regionalCosmicTracks )

RecoTracker/Configuration/python/RecoTrackerP5_cff.py

@@ -15,7 +15,7 @@
 #chi2 set to 40!!
 # CTF
 from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmicsP5_cff import *
-from RecoTracker.SpecialSeedGenerators.SimpleCosmicBONSeeder_cfi import *
+from RecoTracker.SpecialSeedGenerators.SimpleCosmicBONSeeder_cff import *
 from RecoTracker.TkSeedGenerator.GlobalCombinedSeeds_cff import *
 combinedP5SeedsForCTF = RecoTracker.TkSeedGenerator.GlobalCombinedSeeds_cfi.globalCombinedSeeds.clone()
 combinedP5SeedsForCTF.seedCollections = cms.VInputTag(
@@ -46,7 +46,8 @@
 ckfTrackCandidatesP5LHCNavigation    = ckfTrackCandidatesP5.clone(NavigationSchool = cms.string('SimpleNavigationSchool'))
 ctfWithMaterialTracksP5LHCNavigation = ctfWithMaterialTracksCosmics.clone(src = cms.InputTag("ckfTrackCandidatesP5LHCNavigation"))
 
-ctftracksP5 = cms.Sequence(combinatorialcosmicseedfinderP5*simpleCosmicBONSeeds*combinedP5SeedsForCTF*
+ctftracksP5 = cms.Sequence(combinatorialcosmicseedinglayersP5+combinatorialcosmicseedfinderP5*
+                           simpleCosmicBONSeedingLayers*simpleCosmicBONSeeds*combinedP5SeedsForCTF*
                            ckfTrackCandidatesP5*ctfWithMaterialTracksCosmics*ctfWithMaterialTracksP5+
                            ckfTrackCandidatesP5LHCNavigation*ctfWithMaterialTracksP5LHCNavigation)
 

RecoTracker/SpecialSeedGenerators/interface/BeamHaloPairGenerator.h

@@ -4,13 +4,14 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 #include "RecoTracker/TkTrackingRegions/interface/OrderedHitsGenerator.h"
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegion.h"
 #include "RecoTracker/TkHitPairs/interface/OrderedHitPairs.h"
-#include "RecoTracker/TkSeedingLayers/interface/SeedingLayerSets.h"
 #include "RecoTracker/TkSeedingLayers/interface/OrderedSeedingHits.h"
-#include "RecoTracker/TkSeedingLayers/interface/SeedingLayerSetsBuilder.h"
+
+class SeedingLayerSetsHits;
 
 class BeamHaloPairGenerator : public OrderedHitsGenerator {
 	public:
@@ -20,8 +21,7 @@ class BeamHaloPairGenerator : public OrderedHitsGenerator {
 					      const edm::Event & ev, 
 					      const edm::EventSetup& es);
 	private:
-	SeedingLayerSetsBuilder theLayerBuilder;
-	ctfseeding::SeedingLayerSets theLss;
+	edm::EDGetTokenT<SeedingLayerSetsHits> theSeedingLayerToken;
 	OrderedHitPairs hitPairs;
 	double theMaxTheta;
 };

RecoTracker/SpecialSeedGenerators/interface/GenericPairGenerator.h

@@ -4,13 +4,15 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 #include "RecoTracker/TkTrackingRegions/interface/OrderedHitsGenerator.h"
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegion.h"
 #include "RecoTracker/TkHitPairs/interface/OrderedHitPairs.h"
-#include "RecoTracker/TkSeedingLayers/interface/SeedingLayerSetsBuilder.h"
 #include "RecoTracker/TkSeedingLayers/interface/OrderedSeedingHits.h"
 
+class SeedingLayerSetsHits;
+
 class GenericPairGenerator : public OrderedHitsGenerator {
 	public:
 	GenericPairGenerator(const edm::ParameterSet& conf, edm::ConsumesCollector& iC);
@@ -20,8 +22,7 @@ class GenericPairGenerator : public OrderedHitsGenerator {
 					      const edm::EventSetup& es);
         void clear() { hitPairs.clear();}
 	private:
-	SeedingLayerSetsBuilder theLsb;
-	ctfseeding::SeedingLayerSets theLss;
+	edm::EDGetTokenT<SeedingLayerSetsHits> theSeedingLayerToken;
 	OrderedHitPairs hitPairs;
 };
 

RecoTracker/SpecialSeedGenerators/interface/GenericTripletGenerator.h

@@ -4,14 +4,13 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 #include "RecoTracker/TkTrackingRegions/interface/OrderedHitsGenerator.h"
 #include "RecoTracker/TkTrackingRegions/interface/TrackingRegion.h"
 #include "RecoPixelVertexing/PixelTriplets/interface/OrderedHitTriplets.h"
-#include "RecoTracker/TkSeedingLayers/interface/SeedingLayerSetsBuilder.h"
 #include "RecoTracker/TkSeedingLayers/interface/OrderedSeedingHits.h"
-
-//class ctfseeding::SeedingLayers;
+#include "TrackingTools/TransientTrackingRecHit/interface/SeedingLayerSetsHits.h"
 
 class GenericTripletGenerator : public OrderedHitsGenerator {
 	public:
@@ -24,9 +23,8 @@ class GenericTripletGenerator : public OrderedHitsGenerator {
 	private:
 	std::pair<bool,float> qualityFilter(const OrderedHitTriplet& oht, 
 					    const std::map<float, OrderedHitTriplet>& map,
-					    const ctfseeding::SeedingLayers& ls) const;
-	SeedingLayerSetsBuilder theLsb;	
-	ctfseeding::SeedingLayerSets theLss;
+					    const SeedingLayerSetsHits::SeedingLayerSet& ls) const;
+	edm::EDGetTokenT<SeedingLayerSetsHits> theSeedingLayerToken;
 	OrderedHitTriplets hitTriplets;
 };
 

RecoTracker/SpecialSeedGenerators/interface/SimpleCosmicBONSeeder.h

@@ -9,6 +9,7 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h"
@@ -26,7 +27,6 @@
 #include "RecoTracker/TkSeedGenerator/interface/FastCircle.h"
 #include "RecoTracker/TkSeedGenerator/interface/FastHelix.h"
 #include "RecoTracker/SpecialSeedGenerators/interface/ClusterChecker.h"
-#include "RecoTracker/TkSeedingLayers/interface/SeedingLayerSetsBuilder.h"
 
 #include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"
 #include "TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h"
@@ -36,6 +36,7 @@
 #include "TrackingTools/Records/interface/TransientRecHitRecord.h"
 #include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
 
+class SeedingLayerSetsHits;
 
 class SimpleCosmicBONSeeder : public edm::EDProducer
 {
@@ -61,8 +62,7 @@ class SimpleCosmicBONSeeder : public edm::EDProducer
   edm::ParameterSet conf_;
   std::string builderName;
 
-  SeedingLayerSetsBuilder theLsb;
-  ctfseeding::SeedingLayerSets theLss;
+  edm::EDGetTokenT<SeedingLayerSetsHits> seedingLayerToken_;
   GlobalTrackingRegion region_;
   double pMin_;
   bool writeTriplets_;
@@ -71,7 +71,6 @@ class SimpleCosmicBONSeeder : public edm::EDProducer
   double rescaleError_;
 
   uint32_t tripletsVerbosity_,seedVerbosity_, helixVerbosity_;
-  std::vector<std::string> layerTripletNames_;
 
   edm::ESHandle<MagneticField>                  magfield;
   edm::ESHandle<TrackerGeometry>                tracker;

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cff.py

@@ -5,3 +5,7 @@
 #get the module combinatorialbeamhaloseedfinder
 from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForBeamHalo_cfi import *
 
+beamhaloTrackerSeedingLayers = cms.EDProducer("SeedingLayersEDProducer",
+    layerInfo,
+    layerList = layerList
+)

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py

@@ -79,20 +79,14 @@
             maxTheta = cms.double(0.1),
             PropagationDirection = cms.string('alongMomentum'),
             NavigationDirection = cms.string('outsideIn'),
-            LayerPSet = cms.PSet(
-                layerInfo,
-                layerList = layerList
-            )
+            LayerSrc = cms.InputTag("beamhaloTrackerSeedingLayers")
         ), 
         cms.PSet(
             ComponentName = cms.string('BeamHaloPairGenerator'),
             maxTheta = cms.double(0.1),
             PropagationDirection = cms.string('oppositeToMomentum'),
             NavigationDirection = cms.string('outsideIn'),
-            LayerPSet = cms.PSet(
-                layerInfo,
-                layerList = layerList
-            )
+            LayerSrc = cms.InputTag("beamhaloTrackerSeedingLayers")
         )),
     UseScintillatorsConstraint = cms.bool(False),
     TTRHBuilder = cms.string('WithTrackAngle'),

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsP5_cff.py

@@ -23,6 +23,63 @@
 from RecoTracker.TransientTrackingRecHit.TransientTrackingRecHitBuilderWithoutRefit_cfi import *
 import copy
 from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmics_cfi import *
+# seeding layers
+combinatorialcosmicseedingtripletsP5 = cms.EDProducer("SeedingLayersEDProducer",
+    layerInfo,
+    layerList = cms.vstring('TOB4+TOB5+TOB6', 
+        'TOB3+TOB5+TOB6', 
+        'TOB3+TOB4+TOB5', 
+        'TOB2+TOB4+TOB5', 
+        'TOB3+TOB4+TOB6', 
+        'TOB2+TOB4+TOB6')
+)
+combinatorialcosmicseedingpairsTOBP5 = cms.EDProducer("SeedingLayersEDProducer",
+    layerInfo,
+    layerList = cms.vstring('TOB5+TOB6', 
+        'TOB4+TOB5')
+)
+combinatorialcosmicseedingpairsTECposP5 = cms.EDProducer("SeedingLayersEDProducer",
+    layerList = cms.vstring('TEC1_pos+TEC2_pos', 
+        'TEC2_pos+TEC3_pos', 
+        'TEC3_pos+TEC4_pos', 
+        'TEC4_pos+TEC5_pos', 
+        'TEC5_pos+TEC6_pos', 
+        'TEC6_pos+TEC7_pos', 
+        'TEC7_pos+TEC8_pos', 
+        'TEC8_pos+TEC9_pos'),
+    TEC = cms.PSet(
+        minRing = cms.int32(5),
+        matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
+        useRingSlector = cms.bool(True),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
+        maxRing = cms.int32(7)
+    )
+)
+combinatorialcosmicseedingpairsTECnegP5 = cms.EDProducer("SeedingLayersEDProducer",
+    layerList = cms.vstring('TEC1_neg+TEC2_neg', 
+        'TEC2_neg+TEC3_neg', 
+        'TEC3_neg+TEC4_neg', 
+        'TEC4_neg+TEC5_neg', 
+        'TEC5_neg+TEC6_neg', 
+        'TEC6_neg+TEC7_neg', 
+        'TEC7_neg+TEC8_neg', 
+        'TEC8_neg+TEC9_neg'),
+    TEC = cms.PSet(
+        minRing = cms.int32(5),
+        matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
+        useRingSlector = cms.bool(True),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
+        maxRing = cms.int32(7)
+    )
+)
+combinatorialcosmicseedinglayersP5 = cms.Sequence(
+    combinatorialcosmicseedingtripletsP5 +
+    combinatorialcosmicseedingpairsTOBP5 +
+    combinatorialcosmicseedingpairsTECposP5 +
+    combinatorialcosmicseedingpairsTECnegP5
+)
 #recHitMatcher
 #include "RecoLocalTracker/SiStripRecHitConverter/data/SiStripRecHitMatcher.cfi"
 #seeding module
@@ -32,117 +89,37 @@
 combinatorialcosmicseedfinderP5.UseScintillatorsConstraint = False
 combinatorialcosmicseedfinderP5.OrderedHitsFactoryPSets = cms.VPSet(cms.PSet(
     ComponentName = cms.string('GenericTripletGenerator'),
-    LayerPSet = cms.PSet(
-        layerInfo,
-        layerList = cms.vstring('TOB4+TOB5+TOB6', 
-            'TOB3+TOB5+TOB6', 
-            'TOB3+TOB4+TOB5', 
-            'TOB2+TOB4+TOB5', 
-            'TOB3+TOB4+TOB6', 
-            'TOB2+TOB4+TOB6')
-    ),
+    LayerSrc = cms.InputTag("combinatorialcosmicseedingtripletsP5"),
     PropagationDirection = cms.string('alongMomentum'),
     NavigationDirection = cms.string('outsideIn')
 ), 
     cms.PSet(
         ComponentName = cms.string('GenericPairGenerator'),
-        LayerPSet = cms.PSet(
-            layerInfo,
-            layerList = cms.vstring('TOB5+TOB6', 
-                'TOB4+TOB5')
-        ),
+        LayerSrc = cms.InputTag("combinatorialcosmicseedingpairsTOBP5"),
         PropagationDirection = cms.string('alongMomentum'),
         NavigationDirection = cms.string('outsideIn')
     ), 
     cms.PSet(
         ComponentName = cms.string('GenericPairGenerator'),
-        LayerPSet = cms.PSet(
-            layerList = cms.vstring('TEC1_pos+TEC2_pos', 
-                'TEC2_pos+TEC3_pos', 
-                'TEC3_pos+TEC4_pos', 
-                'TEC4_pos+TEC5_pos', 
-                'TEC5_pos+TEC6_pos', 
-                'TEC6_pos+TEC7_pos', 
-                'TEC7_pos+TEC8_pos', 
-                'TEC8_pos+TEC9_pos'),
-            TEC = cms.PSet(
-                minRing = cms.int32(5),
-                matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-                useRingSlector = cms.bool(True),
-                TTRHBuilder = cms.string('WithTrackAngle'),
-                rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
-                maxRing = cms.int32(7)
-            )
-        ),
+        LayerSrc = cms.InputTag("combinatorialcosmicseedingpairsTECposP5"),
         PropagationDirection = cms.string('alongMomentum'),
         NavigationDirection = cms.string('outsideIn')
     ), 
     cms.PSet(
         ComponentName = cms.string('GenericPairGenerator'),
-        LayerPSet = cms.PSet(
-            layerList = cms.vstring('TEC1_pos+TEC2_pos', 
-                'TEC2_pos+TEC3_pos', 
-                'TEC3_pos+TEC4_pos', 
-                'TEC4_pos+TEC5_pos', 
-                'TEC5_pos+TEC6_pos', 
-                'TEC6_pos+TEC7_pos', 
-                'TEC7_pos+TEC8_pos', 
-                'TEC8_pos+TEC9_pos'),
-            TEC = cms.PSet(
-                minRing = cms.int32(5),
-                matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-                useRingSlector = cms.bool(True),
-                TTRHBuilder = cms.string('WithTrackAngle'),
-                rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
-                maxRing = cms.int32(7)
-            )
-        ),
+        LayerSrc = cms.InputTag("combinatorialcosmicseedingpairsTECposP5"),
         PropagationDirection = cms.string('alongMomentum'),
         NavigationDirection = cms.string('insideOut')
     ), 
     cms.PSet(
         ComponentName = cms.string('GenericPairGenerator'),
-        LayerPSet = cms.PSet(
-            layerList = cms.vstring('TEC1_neg+TEC2_neg', 
-                'TEC2_neg+TEC3_neg', 
-                'TEC3_neg+TEC4_neg', 
-                'TEC4_neg+TEC5_neg', 
-                'TEC5_neg+TEC6_neg', 
-                'TEC6_neg+TEC7_neg', 
-                'TEC7_neg+TEC8_neg', 
-                'TEC8_neg+TEC9_neg'),
-            TEC = cms.PSet(
-                minRing = cms.int32(5),
-                matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-                useRingSlector = cms.bool(True),
-                TTRHBuilder = cms.string('WithTrackAngle'),
-                rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
-                maxRing = cms.int32(7)
-            )
-        ),
+        LayerSrc = cms.InputTag("combinatorialcosmicseedingpairsTECnegP5"),
         PropagationDirection = cms.string('alongMomentum'),
         NavigationDirection = cms.string('outsideIn')
     ), 
     cms.PSet(
         ComponentName = cms.string('GenericPairGenerator'),
-        LayerPSet = cms.PSet(
-            layerList = cms.vstring('TEC1_neg+TEC2_neg', 
-                'TEC2_neg+TEC3_neg', 
-                'TEC3_neg+TEC4_neg', 
-                'TEC4_neg+TEC5_neg', 
-                'TEC5_neg+TEC6_neg', 
-                'TEC6_neg+TEC7_neg', 
-                'TEC7_neg+TEC8_neg', 
-                'TEC8_neg+TEC9_neg'),
-            TEC = cms.PSet(
-                minRing = cms.int32(5),
-                matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-                useRingSlector = cms.bool(True),
-                TTRHBuilder = cms.string('WithTrackAngle'),
-                rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
-                maxRing = cms.int32(7)
-            )
-        ),
+        LayerSrc = cms.InputTag("combinatorialcosmicseedingpairsTECnegP5"),
         PropagationDirection = cms.string('alongMomentum'),
         NavigationDirection = cms.string('insideOut')
     ))

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cff.py

@@ -1,3 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
 from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi import *
+
+regionalCosmicTrackerSeedingLayers = cms.EDProducer("SeedingLayersEDProducer",
+    layerInfo,
+    layerList = layerList
+)