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 configuration in RecoTracker{SpecialSeedGenerators} to use default cfipython #34009

Merged
merged 4 commits into from
Jun 14, 2021
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
875f645
replace EDProducer with clone from cfipy and drop type spec
jeongeun Jun 8, 2021
f985502
revert to use PSet
jeongeun Jun 11, 2021
e19f471
fix
jeongeun Jun 14, 2021
d4faa16
fix align
jeongeun Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
4 changes: 2 additions & 2 deletions RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForBeamHalo_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
),
)

layerList = cms.vstring(
layerList = [
'FPix1_pos+FPix2_pos',
'FPix1_neg+FPix2_neg',
'TID2_pos+TID3_pos',
Expand All @@ -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
Expand Down
58 changes: 30 additions & 28 deletions RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsP5_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand All @@ -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"),
Expand Down
3 changes: 2 additions & 1 deletion ...alSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
26 changes: 13 additions & 13 deletions ...alSeedGenerators/python/CombinatorialSeedGeneratorForCosmicsRegionalReconstruction_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
15 changes: 9 additions & 6 deletions RecoTracker/SpecialSeedGenerators/python/CombinatorialSeedGeneratorForCosmics_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
),
)
Copy link
Contributor

@perrotta perrotta Jun 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I don't understand the Build errors, and the log does'nt help me (@smuzaffar ?)

In any case, this parenthesis has to be brought back to the previous position to remain aligned. Maybe one can try to fix, and see if the Build error disappears...

Moreover @jeongeun could you please further:

  • Add an empty line before L56, so that one can better notice where the EDProducer configuration actually starts (and perhaps also remove the empty line now uselessly inserted at L58
  • Align L78-L89

Copy link
Contributor

@qliphy qliphy Jun 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I don't understand the Build errors, and the log does'nt help me (@smuzaffar ?)

You can find comment from @smuzaffar here: #33863 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't understand the Build errors, and the log does'nt help me (@smuzaffar ?)

You can find comment from @smuzaffar here: #33863 (comment)

Thank you @qliphy !

)
combinatorialcosmicseedingtripletsTOB_layerList = cms.vstring('MTOB4+MTOB5+MTOB6',
'MTOB3+MTOB5+MTOB6',
Expand Down
5 changes: 3 additions & 2 deletions RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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),
)
2 changes: 0 additions & 2 deletions RecoTracker/SpecialSeedGenerators/python/SimpleCosmicBONSeeder_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down