Further fixes to configuration

Author: makortel

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*

RecoHI/HiMuonAlgos/python/HiRegitMuonTobTecStep_cff.py

@@ -24,9 +24,7 @@
 )
 
 # SEEDING LAYERS
-hiRegitMuTobTecStepSeedLayers =  RecoTracker.IterativeTracking.TobTecStep_cff.tobTecStepSeedLayers.clone(
-    ComponentName    = cms.string('hiRegitMuTobTecStepSeedLayers'),
-     )
+hiRegitMuTobTecStepSeedLayers =  RecoTracker.IterativeTracking.TobTecStep_cff.tobTecStepSeedLayers.clone()
 hiRegitMuTobTecStepSeedLayers.TOB.skipClusters = cms.InputTag('hiRegitMuTobTecStepClusters')
 hiRegitMuTobTecStepSeedLayers.TEC.skipClusters = cms.InputTag('hiRegitMuTobTecStepClusters')
 
@@ -97,6 +95,7 @@
 )
 
 hiRegitMuonTobTecStep = cms.Sequence(hiRegitMuTobTecStepClusters*
+                                     hiRegitMuTobTecStepSeedLayers*
                                      hiRegitMuTobTecStepSeeds*
                                      hiRegitMuTobTecStepTrackCandidates*
                                      hiRegitMuTobTecStepTracks*

RecoHI/HiTracking/python/hiRegitMixedTripletStep_cff.py

@@ -31,9 +31,7 @@
 
 
 # SEEDING LAYERS A
-hiRegitMixedTripletStepSeedLayersA =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersA.clone(
-    ComponentName = 'hiRegitMixedTripletStepSeedLayersA'
-    )
+hiRegitMixedTripletStepSeedLayersA =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersA.clone()
 hiRegitMixedTripletStepSeedLayersA.BPix.skipClusters = cms.InputTag('hiRegitMixedTripletStepClusters')
 hiRegitMixedTripletStepSeedLayersA.FPix.skipClusters = cms.InputTag('hiRegitMixedTripletStepClusters')
 hiRegitMixedTripletStepSeedLayersA.TEC.skipClusters  = cms.InputTag('hiRegitMixedTripletStepClusters')
@@ -51,9 +49,7 @@
 hiRegitMixedTripletStepSeedsA.RegionFactoryPSet.RegionPSet.ptMin = 1.0
 
 # SEEDING LAYERS B
-hiRegitMixedTripletStepSeedLayersB =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersB.clone(
-    ComponentName = 'hiRegitMixedTripletStepSeedLayersB',
-    )
+hiRegitMixedTripletStepSeedLayersB =  RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepSeedLayersB.clone()
 hiRegitMixedTripletStepSeedLayersB.BPix.skipClusters = cms.InputTag('hiRegitMixedTripletStepClusters')
 hiRegitMixedTripletStepSeedLayersB.TIB.skipClusters  = cms.InputTag('hiRegitMixedTripletStepClusters')
 hiRegitMixedTripletStepSeedLayersB.layerList = cms.vstring('BPix2+BPix3+TIB1','BPix2+BPix3+TIB2')
@@ -125,7 +121,9 @@
     ) #end of clone  
 
 hiRegitMixedTripletStep = cms.Sequence(hiRegitMixedTripletStepClusters*
+                                       hiRegitMixedTripletStepSeedLayersA*
                                        hiRegitMixedTripletStepSeedsA*
+                                       hiRegitMixedTripletStepSeedLayersB*
                                        hiRegitMixedTripletStepSeedsB*
                                        hiRegitMixedTripletStepSeeds*
                                        hiRegitMixedTripletStepTrackCandidates*

RecoHI/HiTracking/python/hiRegitPixelPairStep_cff.py

@@ -30,9 +30,7 @@
 
 
 # SEEDING LAYERS
-hiRegitPixelPairStepSeedLayers =  RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepSeedLayers.clone(
-    ComponentName = 'hiRegitPixelPairStepSeedLayers'
-    )
+hiRegitPixelPairStepSeedLayers =  RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepSeedLayers.clone()
 hiRegitPixelPairStepSeedLayers.BPix.skipClusters = cms.InputTag('hiRegitPixelPairStepClusters')
 hiRegitPixelPairStepSeedLayers.FPix.skipClusters = cms.InputTag('hiRegitPixelPairStepClusters')
 
@@ -101,6 +99,7 @@
     ) #end of clone  
 
 hiRegitPixelPairStep = cms.Sequence(hiRegitPixelPairStepClusters*
+                                    hiRegitPixelPairStepSeedLayers*
                                     hiRegitPixelPairStepSeeds*
                                     hiRegitPixelPairStepTrackCandidates*
                                     hiRegitPixelPairStepTracks*

RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cff.py

@@ -29,7 +29,6 @@
     )
 
 convLayerPairs = cms.EDProducer("SeedingLayersEDProducer",
-                                ComponentName = cms.string('convLayerPairs'),
                                 layerList = cms.vstring('BPix1+BPix2', 
 
                                                         'BPix2+BPix3', 

RecoTracker/IterativeTracking/python/TobTecHybridStep_cff.py

@@ -4,7 +4,6 @@
 
 # TRIPLET SEEDING LAYERS
 tobTecStepSeedLayersTripl = cms.EDProducer("SeedingLayersEDProducer",
-    ComponentName = cms.string('tobTecStepSeedLayersTripl'),
     layerList = cms.vstring(
     #TOB
     'TOB1+TOB2+MTOB3',

SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py

@@ -236,11 +236,12 @@ def customise_Reco(process,pileup):
     process.reconstruction.remove(process.ak7CastorJetID)
 
     #the quadruplet merger configuration     
-    process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
-    process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
-    process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )    
+    # from this PSet the quadruplet merger uses only the layer list so these could probably be removed
+    from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import PixelSeedMergerQuadruplets
+    PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
+    PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )
 
     # Need these until pixel templates are used
     process.load("SLHCUpgradeSimulations.Geometry.recoFromSimDigis_cff")
@@ -265,7 +266,6 @@ def customise_Reco(process,pileup):
     # End of pixel template needed section
 
     # Make pixelTracks use quadruplets
-    from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import PixelSeedMergerQuadruplets
     process.pixelTracks.SeedMergerPSet = cms.PSet(
         layerList = PixelSeedMergerQuadruplets,
         addRemainingTriplets = cms.bool(False),

SLHCUpgradeSimulations/Configuration/python/phase2TkCustomsBE.py

@@ -200,11 +200,11 @@ def customise_Reco(process,pileup):
     process.PixelCPEGenericESProducer.DoCosmics = False
     process.siPixelRecHits.CPE = cms.string('PixelCPEGeneric')
     #the quadruplet merger configuration     
-    process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
-    process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
-    process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
+    # from this PSet the quadruplet merger uses only the layer list so these could probably be removed
+    PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
+    PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )
 
     process.highPtTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
     process.detachedTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')

SLHCUpgradeSimulations/Configuration/python/phase2TkCustomsBE5D.py

@@ -167,11 +167,11 @@ def customise_Reco(process):
     process.PixelCPEGenericESProducer.DoCosmics = False
     process.siPixelRecHits.CPE = cms.string('PixelCPEGeneric')
     #the quadruplet merger configuration     
-    process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
-    process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
-    process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
+    # from this PSet the quadruplet merger uses only the layer list so these could probably be removed
+    PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
+    PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )
 
     process.highPtTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
     process.detachedTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')

SLHCUpgradeSimulations/Configuration/python/phase2TkCustoms_LB_4LPS_2L2S.py

@@ -165,11 +165,11 @@ def customise_Reco(process):
     process.PixelCPEGenericESProducer.DoCosmics = False
     process.siPixelRecHits.CPE = cms.string('PixelCPEGeneric')
     #the quadruplet merger configuration     
-    process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
-    process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
-    process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
+    # from this PSet the quadruplet merger uses only the layer list so these could probably be removed
+    PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
+    PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )
 
     process.highPtTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
     process.detachedTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')

SLHCUpgradeSimulations/Configuration/python/phase2TkCustoms_LB_6PS.py

@@ -165,11 +165,11 @@ def customise_Reco(process):
     process.PixelCPEGenericESProducer.DoCosmics = False
     process.siPixelRecHits.CPE = cms.string('PixelCPEGeneric')
     #the quadruplet merger configuration     
-    process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
-    process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
-    process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-    process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
+    # from this PSet the quadruplet merger uses only the layer list so these could probably be removed
+    PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
+    PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )
 
     process.highPtTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')
     process.detachedTripletStepTracks.TTRHBuilder=cms.string('WithTrackAngle')

SLHCUpgradeSimulations/Geometry/python/upgradeTracking_longbarrel_cff.py

@@ -10,11 +10,12 @@
 from RecoTracker.TkTrackingRegions.GlobalTrackingRegionFromBeamSpot_cfi import *
 
 #the quadruplet merger configuration 
+# from this PSet the quadruplet merger uses only the layer list so these could probably be removed
 from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import *
-pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
-pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
+PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
+PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )
 
 # new layer list (3/4 pixel seeding) in stepZero
 PixelLayerTriplets.layerList = cms.vstring( 'BPix1+BPix2+BPix3',

SLHCUpgradeSimulations/Geometry/python/upgradeTracking_phase1_cff.py

@@ -10,11 +10,12 @@
 from RecoTracker.TkTrackingRegions.GlobalTrackingRegionFromBeamSpot_cfi import *
 
 #the quadruplet merger configuration 
+# from this PSet the quadruplet merger uses only the layer list so these could probably be removed
 from RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff import *
-pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
-pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
-pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )
+PixelSeedMergerQuadruplets.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+PixelSeedMergerQuadruplets.BPix.HitProducer = cms.string("siPixelRecHits" )
+PixelSeedMergerQuadruplets.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+PixelSeedMergerQuadruplets.FPix.HitProducer = cms.string("siPixelRecHits" )
 
 # new layer list (3/4 pixel seeding) in stepZero
 PixelLayerTriplets.layerList = cms.vstring( 'BPix1+BPix2+BPix3',