Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate module config in RecoTracker{TkSeedingLayers} to use default seedingLayersEDProducer in cfipython #35549

Merged
merged 2 commits into from Oct 11, 2021
Merged

Migrate module config in RecoTracker{TkSeedingLayers} to use default seedingLayersEDProducer in cfipython #35549

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e82104
cloning seedingLayersEDProducer from cfipython, change PSet to dict
jeongeun Oct 6, 2021
5c27558
minor style update
jeongeun Oct 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions RecoTracker/TkSeedingLayers/python/DisplacedGeneralLayerTriplet_cfi.py
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
from RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi import *

DisplacedGeneralLayerTriplet = seedingLayersEDProducer.clone(
layerList = cms.vstring(
layerList = [
#----------
#TIB
#----------
Expand Down Expand Up @@ -43,38 +43,38 @@
#TID+TEC
'TID1+TID2+TEC1_pos', 'TID1+TID2+TEC1_neg',
'TID2+MTID3+TEC1_pos', 'TID2+MTID3+TEC1_neg',
'MTID3+TEC1_pos+MTEC2_pos', 'MTID3+TEC1_neg+MTEC2_neg'),
'MTID3+TEC1_pos+MTEC2_pos', 'MTID3+TEC1_neg+MTEC2_neg'],


TOB = cms.PSet(
TOB = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
skipClusters = cms.InputTag('displacedGeneralStepClusters')
),

MTOB = cms.PSet(
MTOB = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHit"),
skipClusters = cms.InputTag('displacedGeneralStepClusters')
),

TIB = cms.PSet(
TIB = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
skipClusters = cms.InputTag('displacedGeneralStepClusters')
),

MTIB = cms.PSet(
MTIB = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
skipClusters = cms.InputTag('displacedGeneralStepClusters')
),

TID = cms.PSet(
TID = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
Expand All @@ -84,7 +84,7 @@
maxRing = cms.int32(2)
),

MTID = cms.PSet(
MTID = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
Expand All @@ -94,7 +94,7 @@
maxRing = cms.int32(3)
),

TEC = cms.PSet(
TEC = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
matchedRecHits = cms.InputTag('siStripMatchedRecHits','matchedRecHit'),
Expand All @@ -104,7 +104,7 @@
maxRing = cms.int32(5)
),

MTEC = cms.PSet(
MTEC = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')),
rphiRecHits = cms.InputTag('siStripMatchedRecHits','rphiRecHit'),
Expand Down
6 changes: 3 additions & 3 deletions RecoTracker/TkSeedingLayers/python/MixedLayerPairs_cfi.py
View file
Open in desktop
Expand Up @@ -27,19 +27,19 @@
'FPix2_neg+TEC2_neg',
'TEC1_neg+TEC2_neg',
'TEC2_neg+TEC3_neg'],
TEC = cms.PSet(
TEC = dict(
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(
BPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
),
FPix = cms.PSet(
FPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
)
Expand Down
10 changes: 5 additions & 5 deletions RecoTracker/TkSeedingLayers/python/MixedLayerTriplets_cfi.py
View file
Open in desktop
Expand Up @@ -22,25 +22,25 @@
'FPix1_neg+FPix2_neg+TEC1_neg',
'FPix1_pos+FPix2_pos+TEC2_pos',
'FPix1_neg+FPix2_neg+TEC2_neg'],
TEC = cms.PSet(
TEC = dict(
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
),
FPix = cms.PSet(
FPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
),
TID = cms.PSet(
TID = dict(
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
),
BPix = cms.PSet(
BPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
),
TIB = cms.PSet(
TIB = dict(
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
Expand Down
10 changes: 5 additions & 5 deletions RecoTracker/TkSeedingLayers/python/PixelAndStripLayerPairs_cfi.py
View file
Open in desktop
Expand Up @@ -26,32 +26,32 @@
'FPix2_neg+TID2_neg',
'FPix2_neg+TID3_neg',
'FPix2_neg+TEC1_neg'],
TIB = cms.PSet(
TIB = dict(
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
),
TID = cms.PSet(
TID = dict(
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(
TEC = dict(
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(
BPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
),
FPix = cms.PSet(
FPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
),
Expand Down
4 changes: 2 additions & 2 deletions RecoTracker/TkSeedingLayers/python/PixelLayerPairs_cfi.py
View file
Open in desktop
Expand Up @@ -16,11 +16,11 @@
'BPix2+FPix2_neg',
'FPix1_pos+FPix2_pos',
'FPix1_neg+FPix2_neg'],
BPix = cms.PSet(
BPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
),
FPix = cms.PSet(
FPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
),
Expand Down
39 changes: 19 additions & 20 deletions RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py
View file
Open in desktop
Expand Up @@ -8,31 +8,30 @@
'BPix1+BPix2+FPix1_neg',
'BPix1+FPix1_pos+FPix2_pos',
'BPix1+FPix1_neg+FPix2_neg'],
BPix = cms.PSet(
BPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
),
FPix = cms.PSet(
FPix = dict(
TTRHBuilder = cms.string('WithTrackAngle'),
HitProducer = cms.string('siPixelRecHits'),
)
)
_layersForPhase1 = [
'BPix1+BPix2+BPix3',
'BPix2+BPix3+BPix4',
'BPix1+BPix3+BPix4',
'BPix1+BPix2+BPix4',
'BPix2+BPix3+FPix1_pos',
'BPix2+BPix3+FPix1_neg',
'BPix1+BPix2+FPix1_pos',
'BPix1+BPix2+FPix1_neg',
'BPix2+FPix1_pos+FPix2_pos',
'BPix2+FPix1_neg+FPix2_neg',
'BPix1+FPix1_pos+FPix2_pos',
'BPix1+FPix1_neg+FPix2_neg',
'FPix1_pos+FPix2_pos+FPix3_pos',
'FPix1_neg+FPix2_neg+FPix3_neg'
]
_layersForPhase1 = ['BPix1+BPix2+BPix3',
'BPix2+BPix3+BPix4',
'BPix1+BPix3+BPix4',
'BPix1+BPix2+BPix4',
'BPix2+BPix3+FPix1_pos',
'BPix2+BPix3+FPix1_neg',
'BPix1+BPix2+FPix1_pos',
'BPix1+BPix2+FPix1_neg',
'BPix2+FPix1_pos+FPix2_pos',
'BPix2+FPix1_neg+FPix2_neg',
'BPix1+FPix1_pos+FPix2_pos',
'BPix1+FPix1_neg+FPix2_neg',
'FPix1_pos+FPix2_pos+FPix3_pos',
'FPix1_neg+FPix2_neg+FPix3_neg']

from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
trackingPhase1.toModify(PixelLayerTriplets, layerList=_layersForPhase1)

Expand All @@ -48,7 +47,7 @@
'FPix4_pos+FPix5_pos+FPix6_pos', 'FPix4_neg+FPix5_neg+FPix6_neg',
'FPix5_pos+FPix6_pos+FPix7_pos', 'FPix5_neg+FPix6_neg+FPix7_neg',
'FPix6_pos+FPix7_pos+FPix8_pos', 'FPix6_neg+FPix7_neg+FPix8_neg',
'FPix6_pos+FPix7_pos+FPix9_pos', 'FPix6_neg+FPix7_neg+FPix9_neg'
]
'FPix6_pos+FPix7_pos+FPix9_pos', 'FPix6_neg+FPix7_neg+FPix9_neg']

from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toModify(PixelLayerTriplets, layerList=_layersForPhase2)
2 changes: 1 addition & 1 deletion RecoTracker/TkSeedingLayers/python/PixelLessLayerPairs4PixelLessTracking_cfi.py
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@
maxRing = cms.int32(2),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
),
TEC = cms.PSet(
TEC = dict(
useSimpleRphiHitsCleaner = cms.bool(False),
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
rphiRecHits = cms.InputTag("siStripMatchedRecHits","rphiRecHitUnmatched"),
Expand Down
12 changes: 5 additions & 7 deletions RecoTracker/TkSeedingLayers/python/PixelLessLayerPairs_cfi.py
View file
Open in desktop
Expand Up @@ -4,10 +4,8 @@

PixelLessLayerPairs = seedingLayersEDProducer.clone(
layerList = ['TIB1+TIB2',
'TIB1+TID1_pos',
# 'TIB1+TID2_pos',
'TIB1+TID1_neg',
# 'TIB1+TID2_neg',
'TIB1+TID1_pos', # 'TIB1+TID2_pos',
'TIB1+TID1_neg', # 'TIB1+TID2_neg',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if I understand why the comment was moved, I would think this is clearer:

Suggested change
'TIB1+TID1_pos', # 'TIB1+TID2_pos',
'TIB1+TID1_neg', # 'TIB1+TID2_neg',
'TIB1+TID1_pos',
# 'TIB1+TID2_pos',
'TIB1+TID1_neg',
# 'TIB1+TID2_neg',

'TID1_pos+TID2_pos',
'TID2_pos+TID3_pos',
'TID3_pos+TEC1_pos',
Expand All @@ -29,20 +27,20 @@
# we need a different configuaration of rings for TID disks. Is it feasible
# in the current framework??

TIB = cms.PSet(
TIB = dict(
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
),
TID = cms.PSet(
TID = dict(
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
useRingSlector = cms.bool(True),
TTRHBuilder = cms.string('WithTrackAngle'),
minRing = cms.int32(1),
maxRing = cms.int32(2),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
),
TEC = cms.PSet(
TEC = dict(
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
useRingSlector = cms.bool(True),
TTRHBuilder = cms.string('WithTrackAngle'),
Expand Down
40 changes: 14 additions & 26 deletions RecoTracker/TkSeedingLayers/python/TobTecLayerPairs_cfi.py
View file
Open in desktop
Expand Up @@ -7,39 +7,27 @@
# Don't bother with TEC8 and 9, as tracking requires 2 hits outside
# the seeding pairs.
layerList = ['TOB1+TOB2',
'TOB1+TEC1_pos',
# 'TOB1+TEC2_pos',
'TOB1+TEC1_neg',
# 'TOB1+TEC2_neg',
'TEC1_pos+TEC2_pos',
# 'TEC1_pos+TEC3_pos',
'TEC2_pos+TEC3_pos',
# 'TEC2_pos+TEC4_pos',
'TEC3_pos+TEC4_pos',
# 'TEC3_pos+TEC5_pos',
'TEC4_pos+TEC5_pos',
# 'TEC4_pos+TEC6_pos',
'TEC5_pos+TEC6_pos',
# 'TEC5_pos+TEC7_pos',
'TOB1+TEC1_pos', # 'TOB1+TEC2_pos',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same would apply here with respect to the commented-out part.

'TOB1+TEC1_neg', # 'TOB1+TEC2_neg',
'TEC1_pos+TEC2_pos', # 'TEC1_pos+TEC3_pos',
'TEC2_pos+TEC3_pos', # 'TEC2_pos+TEC4_pos',
'TEC3_pos+TEC4_pos', # 'TEC3_pos+TEC5_pos',
'TEC4_pos+TEC5_pos', # 'TEC4_pos+TEC6_pos',
'TEC5_pos+TEC6_pos', # 'TEC5_pos+TEC7_pos',
'TEC6_pos+TEC7_pos',
'TEC1_neg+TEC2_neg',
# 'TEC1_neg+TEC3_neg',
'TEC2_neg+TEC3_neg',
# 'TEC2_neg+TEC4_neg',
'TEC3_neg+TEC4_neg',
# 'TEC3_neg+TEC5_neg',
'TEC4_neg+TEC5_neg',
# 'TEC4_neg+TEC6_neg',
'TEC5_neg+TEC6_neg',
# 'TEC5_neg+TEC7_neg',
'TEC1_neg+TEC2_neg', # 'TEC1_neg+TEC3_neg',
'TEC2_neg+TEC3_neg', # 'TEC2_neg+TEC4_neg',
'TEC3_neg+TEC4_neg', # 'TEC3_neg+TEC5_neg',
'TEC4_neg+TEC5_neg', # 'TEC4_neg+TEC6_neg',
'TEC5_neg+TEC6_neg', # 'TEC5_neg+TEC7_neg',
'TEC6_neg+TEC7_neg'],

TOB = cms.PSet(
TOB = dict(
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
TTRHBuilder = cms.string('WithTrackAngle'),
clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
),
TEC = cms.PSet(
TEC = dict(
matchedRecHits = cms.InputTag("siStripMatchedRecHits","matchedRecHit"),
useRingSlector = cms.bool(True),
TTRHBuilder = cms.string('WithTrackAngle'),
Expand Down