Merge pull request #34009 from jeongeun/updateRecoTracker12X

Migrate module configuration in RecoTracker{SpecialSeedGenerators} to use default cfipython

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cff.py

@@ -4,8 +4,9 @@
 from RecoTracker.TkSeedingLayers.PixelLayerPairs_cfi import *
 #get the module combinatorialbeamhaloseedfinder
 from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForBeamHalo_cfi import *
+import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
 
-beamhaloTrackerSeedingLayers = cms.EDProducer("SeedingLayersEDProducer",
+beamhaloTrackerSeedingLayers = _mod.seedingLayersEDProducer.clone(
     layerInfo,
-    layerList = layerList
+    layerList = layerList,
 )

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py

@@ -41,7 +41,7 @@
     ),
 )
 
-layerList = cms.vstring(
+layerList = [
     'FPix1_pos+FPix2_pos', 
     'FPix1_neg+FPix2_neg', 
     'TID2_pos+TID3_pos', 
@@ -60,7 +60,7 @@
     'MTEC7_pos+MTEC8_pos',
     'MTEC8_neg+MTEC9_neg',
     'MTEC8_pos+MTEC9_pos'
-    )
+    ]
 
 beamhaloTrackerSeeds = cms.EDProducer("CtfSpecialSeedGenerator",
     SeedMomentum = cms.double(15.0), ##initial momentum in GeV !!!set to a lower value for slice test data

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsP5_cff.py

@@ -20,30 +20,32 @@
 from RecoTracker.TransientTrackingRecHit.TransientTrackingRecHitBuilder_cfi import *
 from RecoTracker.TransientTrackingRecHit.TransientTrackingRecHitBuilderWithoutRefit_cfi import *
 from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmics_cfi import *
+import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
+
 # seeding layers
-combinatorialcosmicseedingtripletsP5 = cms.EDProducer("SeedingLayersEDProducer",
+combinatorialcosmicseedingtripletsP5 = _mod.seedingLayersEDProducer.clone(
     layerInfo,
-    layerList = cms.vstring('MTOB4+MTOB5+MTOB6', 
-        'MTOB3+MTOB5+MTOB6', 
-        'MTOB3+MTOB4+MTOB5', 
-        'TOB2+MTOB4+MTOB5', 
-        'MTOB3+MTOB4+MTOB6', 
-        'TOB2+MTOB4+MTOB6')
+    layerList = ['MTOB4+MTOB5+MTOB6', 
+                 'MTOB3+MTOB5+MTOB6', 
+                 'MTOB3+MTOB4+MTOB5', 
+                 'TOB2+MTOB4+MTOB5', 
+                 'MTOB3+MTOB4+MTOB6', 
+                 'TOB2+MTOB4+MTOB6'],
 )
-combinatorialcosmicseedingpairsTOBP5 = cms.EDProducer("SeedingLayersEDProducer",
+combinatorialcosmicseedingpairsTOBP5 = _mod.seedingLayersEDProducer.clone( 
     layerInfo,
-    layerList = cms.vstring('MTOB5+MTOB6', 
-        'MTOB4+MTOB5')
+    layerList = ['MTOB5+MTOB6', 
+                 'MTOB4+MTOB5'],
 )
-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'),
+combinatorialcosmicseedingpairsTECposP5 = _mod.seedingLayersEDProducer.clone(
+    layerList = ['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"),
@@ -54,15 +56,15 @@
         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'),
+combinatorialcosmicseedingpairsTECnegP5 = _mod.seedingLayersEDProducer.clone(
+    layerList = ['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"),

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cff.py

@@ -1,8 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 from RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi import *
+import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
 
-regionalCosmicTrackerSeedingLayers = cms.EDProducer("SeedingLayersEDProducer",
+regionalCosmicTrackerSeedingLayers = _mod.seedingLayersEDProducer.clone(
     layerInfo,
     layerList = layerList
 )

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi.py

@@ -15,19 +15,19 @@
       maxRing = cms.int32(7)
       )
 )
-layerList = cms.vstring('TOB6+TOB5',
-                        'TOB6+TOB4', 
-                        'TOB6+TOB3',
-                        'TOB5+TOB4',
-                        'TOB5+TOB3',
-                        'TOB4+TOB3',
-                        'TEC1_neg+TOB6',
-                        'TEC1_neg+TOB5',
-                        'TEC1_neg+TOB4',
-                        'TEC1_pos+TOB6',
-                        'TEC1_pos+TOB5',
-                        'TEC1_pos+TOB4'                                   
-                        )
+layerList = ['TOB6+TOB5',
+             'TOB6+TOB4', 
+             'TOB6+TOB3',
+             'TOB5+TOB4',
+             'TOB5+TOB3',
+             'TOB4+TOB3',
+             'TEC1_neg+TOB6',
+             'TEC1_neg+TOB5',
+             'TEC1_neg+TOB4',
+             'TEC1_pos+TOB6',
+             'TEC1_pos+TOB5',
+             'TEC1_pos+TOB4'                                   
+             ]
 from RecoTracker.TkSeedGenerator.SeedFromConsecutiveHitsCreator_cfi import SeedFromConsecutiveHitsCreator as _SeedFromConsecutiveHitsCreator
 CosmicSeedCreator = _SeedFromConsecutiveHitsCreator.clone(
     ComponentName = 'CosmicSeedCreator',

RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmics_cfi.py

@@ -9,31 +9,34 @@
 layerInfo = cms.PSet(
     MTIB = cms.PSet(
         TTRHBuilder = cms.string('WithTrackAngle'),
-            clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
         rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit")
     ),
     TIB = cms.PSet(
         matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
         TTRHBuilder = cms.string('WithTrackAngle'),
-            clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
     ),
     MTOB = cms.PSet(
-        TTRHBuilder = cms.string('WithTrackAngle'),            clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
         rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit")
     ),
     TOB = cms.PSet(
         matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-        TTRHBuilder = cms.string('WithTrackAngle'),            clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
     ),
     TEC = cms.PSet(
         useSimpleRphiHitsCleaner = cms.bool(True),
         minRing = cms.int32(5),
         matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
         useRingSlector = cms.bool(False),
-        TTRHBuilder = cms.string('WithTrackAngle'),            clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')),
         rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
         maxRing = cms.int32(7)
-    ),
+    )
 )
 combinatorialcosmicseedingtripletsTOB_layerList = cms.vstring('MTOB4+MTOB5+MTOB6',
     'MTOB3+MTOB5+MTOB6',
@@ -50,9 +53,9 @@
     'TEC7_pos+TEC8_pos',
     'TEC8_pos+TEC9_pos')
 combinatorialcosmicseedingtripletsTIB_layerList = cms.vstring('TIB1+TIB2+MTIB3')
+
 combinatorialcosmicseedfinder = cms.EDProducer("CtfSpecialSeedGenerator",
     SeedMomentum = cms.double(5.0), ##initial momentum in GeV !!!set to a lower value for slice test data
-
     ErrorRescaling = cms.double(50.0),
     RegionFactoryPSet = cms.PSet(
         RegionPSetBlock,
@@ -66,12 +69,13 @@
         GlobalY = cms.double(300.0)
     ),
     Charges = cms.vint32(-1),
-    OrderedHitsFactoryPSets = cms.VPSet(cms.PSet(
-        ComponentName = cms.string('GenericTripletGenerator'),
-        LayerSrc = cms.InputTag("combinatorialcosmicseedingtripletsTOB"),
-        PropagationDirection = cms.string('alongMomentum'),
-        NavigationDirection = cms.string('outsideIn')
-    ), 
+    OrderedHitsFactoryPSets = cms.VPSet(
+        cms.PSet(
+            ComponentName = cms.string('GenericTripletGenerator'),
+            LayerSrc = cms.InputTag("combinatorialcosmicseedingtripletsTOB"),
+            PropagationDirection = cms.string('alongMomentum'),
+            NavigationDirection = cms.string('outsideIn')
+        ), 
         cms.PSet(
             ComponentName = cms.string('GenericPairGenerator'),
             LayerSrc = cms.InputTag("combinatorialcosmicseedingpairsTECpos"),
@@ -83,7 +87,8 @@
             LayerSrc = cms.InputTag("combinatorialcosmicseedingtripletsTIB"),
             PropagationDirection = cms.string('oppositeToMomentum'),
             NavigationDirection = cms.string('insideOut')
-        )),
+        )
+    ),
     UseScintillatorsConstraint = cms.bool(True),
     TTRHBuilder = cms.string('WithTrackAngle'),
     LowerScintillatorParameters = cms.PSet(

RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cff.py

@@ -1,8 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
 from RecoTracker.SpecialSeedGenerators.SimpleCosmicBONSeeder_cfi import *
+import RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi as _mod
 
-simpleCosmicBONSeedingLayers = cms.EDProducer("SeedingLayersEDProducer",
+simpleCosmicBONSeedingLayers = _mod.seedingLayersEDProducer.clone(
     layerInfo,
-    layerList = cms.vstring(*layerList)
+    layerList = cms.vstring(*layerList),
 )

RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cfi.py

@@ -1,7 +1,5 @@
 import FWCore.ParameterSet.Config as cms
-
 import RecoTracker.SpecialSeedGenerators.CombinatorialSeedGeneratorForCosmics_cfi
-
 def makeSimpleCosmicSeedLayers(*layers):
     layerList = cms.vstring()
     if 'ALL' in layers: