drop type specs where original parameter exists

cms-sw · Jul 19, 2020 · 8192090 · 8192090
1 parent b05f18a
commit 8192090
Show file tree

Hide file tree

Showing 14 changed files with 360 additions and 380 deletions.
diff --git a/RecoTracker/TkSeedingLayers/python/MixedLayerPairs_cfi.py b/RecoTracker/TkSeedingLayers/python/MixedLayerPairs_cfi.py
@@ -5,45 +5,42 @@
 
 from RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi import *
 
-MixedLayerPairs = seedingLayersEDProducer.clone()
-MixedLayerPairs.layerList = cms.vstring('BPix1+BPix2', 
-        'BPix1+BPix3', 
-        'BPix2+BPix3', 
-        'BPix1+FPix1_pos', 
-        'BPix1+FPix1_neg', 
-        'BPix1+FPix2_pos', 
-        'BPix1+FPix2_neg', 
-        'BPix2+FPix1_pos', 
-        'BPix2+FPix1_neg', 
-        'BPix2+FPix2_pos', 
-        'BPix2+FPix2_neg', 
-        'FPix1_pos+FPix2_pos', 
-        'FPix1_neg+FPix2_neg', 
-        'FPix2_pos+TEC1_pos', 
-        'FPix2_pos+TEC2_pos', 
-        'TEC1_pos+TEC2_pos', 
-        'TEC2_pos+TEC3_pos', 
-        'FPix2_neg+TEC1_neg', 
-        'FPix2_neg+TEC2_neg', 
-        'TEC1_neg+TEC2_neg', 
-        'TEC2_neg+TEC3_neg'
+MixedLayerPairs = seedingLayersEDProducer.clone(
+    layerList = ['BPix1+BPix2', 
+                 'BPix1+BPix3', 
+                 'BPix2+BPix3', 
+                 'BPix1+FPix1_pos', 
+                 'BPix1+FPix1_neg', 
+                 'BPix1+FPix2_pos', 
+                 'BPix1+FPix2_neg', 
+                 'BPix2+FPix1_pos', 
+                 'BPix2+FPix1_neg', 
+                 'BPix2+FPix2_pos', 
+                 'BPix2+FPix2_neg', 
+                 'FPix1_pos+FPix2_pos', 
+                 'FPix1_neg+FPix2_neg', 
+                 'FPix2_pos+TEC1_pos', 
+                 'FPix2_pos+TEC2_pos', 
+                 'TEC1_pos+TEC2_pos', 
+                 'TEC2_pos+TEC3_pos', 
+                 'FPix2_neg+TEC1_neg', 
+                 'FPix2_neg+TEC2_neg', 
+                 'TEC1_neg+TEC2_neg', 
+                 'TEC2_neg+TEC3_neg'],
+    TEC = cms.PSet(
+        matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
+        useRingSlector = cms.bool(True),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        minRing = cms.int32(1),
+        maxRing = cms.int32(1),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
+    ),
+    BPix = cms.PSet(
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    ),
+    FPix = cms.PSet(
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    )
 )
-MixedLayerPairs.TEC = cms.PSet(
-    matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-    useRingSlector = cms.bool(True),
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    minRing = cms.int32(1),
-    maxRing = cms.int32(1)
-    ,clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
-)
-MixedLayerPairs.BPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
-)
-MixedLayerPairs.FPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
-)
-
-
-
diff --git a/RecoTracker/TkSeedingLayers/python/MixedLayerTriplets_cfi.py b/RecoTracker/TkSeedingLayers/python/MixedLayerTriplets_cfi.py
@@ -5,47 +5,44 @@
 
 from RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi import *
 
-MixedLayerTriplets = seedingLayersEDProducer.clone()
-MixedLayerTriplets.layerList = cms.vstring('BPix1+BPix2+BPix3', 
-        'BPix1+BPix2+FPix1_pos', 
-        'BPix1+BPix2+FPix1_neg', 
-        'BPix1+FPix1_pos+FPix2_pos', 
-        'BPix1+FPix1_neg+FPix2_neg', 
-        'BPix1+BPix2+TIB1', 
-        'BPix1+BPix3+TIB1', 
-        'BPix2+BPix3+TIB1', 
-        'BPix1+FPix1_pos+TID1_pos', 
-        'BPix1+FPix1_neg+TID1_neg', 
-        'BPix1+FPix1_pos+TID2_pos', 
-        'BPix1+FPix1_neg+TID2_neg', 
-        'FPix1_pos+FPix2_pos+TEC1_pos', 
-        'FPix1_neg+FPix2_neg+TEC1_neg', 
-        'FPix1_pos+FPix2_pos+TEC2_pos', 
-        'FPix1_neg+FPix2_neg+TEC2_neg'
+MixedLayerTriplets = seedingLayersEDProducer.clone(
+    layerList = ['BPix1+BPix2+BPix3', 
+                 'BPix1+BPix2+FPix1_pos', 
+                 'BPix1+BPix2+FPix1_neg', 
+                 'BPix1+FPix1_pos+FPix2_pos', 
+                 'BPix1+FPix1_neg+FPix2_neg', 
+                 'BPix1+BPix2+TIB1', 
+                 'BPix1+BPix3+TIB1', 
+                 'BPix2+BPix3+TIB1', 
+                 'BPix1+FPix1_pos+TID1_pos', 
+                 'BPix1+FPix1_neg+TID1_neg', 
+                 'BPix1+FPix1_pos+TID2_pos', 
+                 'BPix1+FPix1_neg+TID2_neg', 
+                 'FPix1_pos+FPix2_pos+TEC1_pos', 
+                 'FPix1_neg+FPix2_neg+TEC1_neg', 
+                 'FPix1_pos+FPix2_pos+TEC2_pos', 
+                 'FPix1_neg+FPix2_neg+TEC2_neg'],
+    TEC = cms.PSet(
+	matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+	clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
+    ),
+    FPix = cms.PSet(
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    ),
+    TID = cms.PSet(
+        matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
+    ),
+    BPix = cms.PSet(
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    ),
+    TIB = cms.PSet(
+        matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
+    )
 )
-MixedLayerTriplets.TEC = cms.PSet(
-    matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-    TTRHBuilder = cms.string('WithTrackAngle')
-    ,clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
-)
-MixedLayerTriplets.FPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
-)
-MixedLayerTriplets.TID = cms.PSet(
-    matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-    TTRHBuilder = cms.string('WithTrackAngle')
-    ,clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
-)
-MixedLayerTriplets.BPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
-)
-MixedLayerTriplets.TIB = cms.PSet(
-    matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-    TTRHBuilder = cms.string('WithTrackAngle')
-    ,clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
-)
-
-
-
diff --git a/RecoTracker/TkSeedingLayers/python/PixelAndStripLayerPairs_cfi.py b/RecoTracker/TkSeedingLayers/python/PixelAndStripLayerPairs_cfi.py
@@ -5,58 +5,54 @@
 
 from RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi import *
 
-PixelAndStripLayerPairs = seedingLayersEDProducer.clone()
-PixelAndStripLayerPairs.layerList = cms.vstring(
-        'BPix3+TIB1_pos',
-        'BPix2+TIB1_pos',
-        'BPix3+TIB2_pos',
-        'FPix1+TIB1_pos',
-#        'FPix1_pos+TID1_pos',
-#        'FPix2+TIB1_pos',
-        'FPix2_pos+TID1_pos',
-        'FPix2_pos+TID2_pos',
-        'FPix2_pos+TID3_pos',
-        'FPix2_pos+TEC1_pos',
-        'BPix3+TIB1_neg',
-        'BPix2+TIB1_neg',
-        'BPix3+TIB2_neg',
-        'FPix1+TIB1_neg',
-#        'FPix1_neg+TID1_neg',
-#        'FPix2+TIB1_neg',
-        'FPix2_neg+TID1_neg',
-        'FPix2_neg+TID2_neg',
-        'FPix2_neg+TID3_neg',
-        'FPix2_neg+TEC1_neg'
-)
-PixelAndStripLayerPairs.TIB = cms.PSet(
+PixelAndStripLayerPairs = seedingLayersEDProducer.clone(
+    layerList = ['BPix3+TIB1_pos',
+                 'BPix2+TIB1_pos',
+                 'BPix3+TIB2_pos',
+                 'FPix1+TIB1_pos',
+#                 'FPix1_pos+TID1_pos',
+#                 'FPix2+TIB1_pos',
+                 'FPix2_pos+TID1_pos',
+                 'FPix2_pos+TID2_pos',
+                 'FPix2_pos+TID3_pos',
+                 'FPix2_pos+TEC1_pos',
+                 'BPix3+TIB1_neg',
+                 'BPix2+TIB1_neg',
+                 'BPix3+TIB2_neg',
+                 'FPix1+TIB1_neg',
+#                 'FPix1_neg+TID1_neg',
+#                 'FPix2+TIB1_neg',
+                 'FPix2_neg+TID1_neg',
+                 'FPix2_neg+TID2_neg',
+                 'FPix2_neg+TID3_neg',
+                 'FPix2_neg+TEC1_neg'],
+    TIB = cms.PSet(
         matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-        TTRHBuilder = cms.string('WithTrackAngle')
-        ,clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
-)
-PixelAndStripLayerPairs.TID = cms.PSet(
-    matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-    useRingSlector = cms.bool(True),
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    minRing = cms.int32(1),
-    maxRing = cms.int32(1)
-   ,clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
-)
-PixelAndStripLayerPairs.TEC = cms.PSet(
-    matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
-    useRingSlector = cms.bool(True),
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    minRing = cms.int32(1),
-    maxRing = cms.int32(1)
-   ,clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
-)
-PixelAndStripLayerPairs.BPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
-)
-PixelAndStripLayerPairs.FPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
+    ),
+    TID = cms.PSet(
+        matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
+        useRingSlector = cms.bool(True),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        minRing = cms.int32(1),
+        maxRing = cms.int32(1),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
+    ),
+    TEC = cms.PSet(
+        matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
+        useRingSlector = cms.bool(True),
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        minRing = cms.int32(1),
+        maxRing = cms.int32(1),
+        clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
+    ),
+    BPix = cms.PSet(
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    ),
+    FPix = cms.PSet(
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    ),
 )
-
-
-
diff --git a/RecoTracker/TkSeedingLayers/python/PixelLayerPairs_cfi.py b/RecoTracker/TkSeedingLayers/python/PixelLayerPairs_cfi.py
@@ -2,29 +2,26 @@
 
 from RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi import *
 
-PixelLayerPairs = seedingLayersEDProducer.clone()
-PixelLayerPairs.layerList = cms.vstring('BPix1+BPix2', 
-        'BPix1+BPix3', 
-        'BPix2+BPix3', 
-        'BPix1+FPix1_pos', 
-        'BPix1+FPix1_neg', 
-        'BPix1+FPix2_pos', 
-        'BPix1+FPix2_neg', 
-        'BPix2+FPix1_pos', 
-        'BPix2+FPix1_neg', 
-        'BPix2+FPix2_pos', 
-        'BPix2+FPix2_neg', 
-        'FPix1_pos+FPix2_pos', 
-        'FPix1_neg+FPix2_neg'
+PixelLayerPairs = seedingLayersEDProducer.clone(
+    layerList = ['BPix1+BPix2', 
+                 'BPix1+BPix3', 
+                 'BPix2+BPix3', 
+                 'BPix1+FPix1_pos', 
+                 'BPix1+FPix1_neg', 
+                 'BPix1+FPix2_pos', 
+                 'BPix1+FPix2_neg', 
+                 'BPix2+FPix1_pos', 
+                 'BPix2+FPix1_neg', 
+                 'BPix2+FPix2_pos', 
+                 'BPix2+FPix2_neg', 
+                 'FPix1_pos+FPix2_pos', 
+                 'FPix1_neg+FPix2_neg'],
+    BPix = cms.PSet(
+	TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    ),
+    FPix = cms.PSet(
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    ),
 )
-PixelLayerPairs.BPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
-)
-PixelLayerPairs.FPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
-)
-
-
-
diff --git a/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py b/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py
@@ -2,22 +2,21 @@
 
 from RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi import *
 
-PixelLayerTriplets = seedingLayersEDProducer.clone()
-PixelLayerTriplets.layerList = cms.vstring('BPix1+BPix2+BPix3', 
-    'BPix1+BPix2+FPix1_pos', 
-    'BPix1+BPix2+FPix1_neg', 
-    'BPix1+FPix1_pos+FPix2_pos', 
-    'BPix1+FPix1_neg+FPix2_neg'
+PixelLayerTriplets = seedingLayersEDProducer.clone(
+    layerList = ['BPix1+BPix2+BPix3', 
+                 'BPix1+BPix2+FPix1_pos', 
+                 'BPix1+BPix2+FPix1_neg', 
+                 'BPix1+FPix1_pos+FPix2_pos', 
+                 'BPix1+FPix1_neg+FPix2_neg'],
+    BPix = cms.PSet(
+	TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    ),    
+    FPix = cms.PSet(
+        TTRHBuilder = cms.string('WithTrackAngle'),
+        HitProducer = cms.string('siPixelRecHits'),
+    )
 )
-PixelLayerTriplets.BPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
-)    
-PixelLayerTriplets.FPix = cms.PSet(
-    TTRHBuilder = cms.string('WithTrackAngle'),
-    HitProducer = cms.string('siPixelRecHits'),
-)
-
 _layersForPhase1 = [
     'BPix1+BPix2+BPix3',
     'BPix2+BPix3+BPix4',
@@ -53,4 +52,3 @@
 ]
 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
 trackingPhase2PU140.toModify(PixelLayerTriplets, layerList=_layersForPhase2)
-