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

Seeding layers ESP to EDP migration #2378

Merged
merged 50 commits into from
Feb 19, 2014
Merged

Seeding layers ESP to EDP migration #2378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
492a8a8
Remove hasPredefinedHitErrors member from SeedingLayer(SetsBuilder) a…
makortel Jan 31, 2014
ca34e46
Remove useErrorsFromParam, hitErrorRZ, and hitErrorRPhi from configur…
makortel Jan 31, 2014
dc40c65
Add SeedingLayerSetsHits for transient EDProduct of SeedingLayers
makortel Jan 8, 2014
05758c0
Add SeedingLayersEDProducer
makortel Jan 8, 2014
f0181ed
Add TrackingRegion::hits(const SeedingLayerSetsHits::SeedingLayer&) i…
makortel Jan 8, 2014
d0e1c52
Migrate LayerHitMapCache to SeedingLayerSetsHits
makortel Jan 8, 2014
5675c03
Migrate HitPairGeneratorFromLayerPair to SeedingLayerSetsHits
makortel Jan 9, 2014
7b31f99
Migrate CombinedHitPairGenerator to SeedingLayerSetsHits
makortel Jan 9, 2014
988d88f
Migrate LayerTriplets to SeedingLayerSetsHits
makortel Jan 9, 2014
36a366e
Migrate HitTripletGeneratorFromPairAndLayers classes to SeedingLayerS…
makortel Jan 9, 2014
2b61caa
Migrate CombinedHitTripletGenerator to SeedingLayerSetsHits
makortel Jan 9, 2014
95abe58
Migrate CombinedMultiHitGenerator, MultiHitGeneratorFromPairAndLayers…
makortel Jan 9, 2014
478826e
Migrate configuration: TobTecLayerPairs_cfi
makortel Jan 10, 2014
fe74c82
Migrate configuration: PixelLessLayerPairs_cfi
makortel Jan 10, 2014
5fbb1ec
Migrate configuration: PixelLessLayerPairs4PixelLessTracking_cfi
makortel Jan 10, 2014
5125bec
Migrate configuration: PixelLayerTriplets_cfi
makortel Jan 10, 2014
9dfbbc6
Migrate configuration: PixelLayerPairs_cfi
makortel Jan 10, 2014
b4d73c6
Migrate configuration: PixelAndStripLayerPairs_cfi
makortel Jan 10, 2014
ee01c98
Migrate configuration: MixedLayerPairs_cfi
makortel Jan 17, 2014
2178d9a
Migrate bunch of configuration files without any knock-on effects
makortel Jan 17, 2014
5a1d728
Migrate conversion configuration files
makortel Jan 10, 2014
c56732c
Migrate configuration: thirdStep_cff
makortel Jan 10, 2014
a9355e1
Migrate configuration: secondStep_cff
makortel Jan 10, 2014
bc6e6a0
Migrate EgammaHLTRegionalPixelSeedGeneratorProducers
makortel Jan 13, 2014
1b7fe0e
Migrate QuadrupletSeedMerger
makortel Jan 10, 2014
ede1c91
Remove SeedingLayerESProducer as obsolete
makortel Jan 10, 2014
8421c8f
Add edm::ConsumesCollector parameter to SeedFilter constructor
makortel Nov 12, 2013
4f569be
Add edm::ConsumesCollector to OrderedHitsGenerator constructors
makortel Nov 12, 2013
367c7d5
Migrate SeedingLayerSetsHits consumers to getByToken
makortel Jan 10, 2014
116c218
Construct HitExtractors in SeedingLayerSetsBuilder constructor
makortel Nov 19, 2013
3398b22
Convert HitExtractorPIX and HitExtractorSTRP to getByToken()
makortel Nov 20, 2013
7018f13
Add SeedingLayerSetsBuilder::check(), use edm::ESWatcher
makortel Jan 23, 2014
8d7f22b
Use SeedingLayerSetsBuilder::check() in SeedingLayerSetsBuilder users
makortel Jan 23, 2014
ccabe68
Add SeedindLayerSetsHits::swap() for more efficient edm::Event::put()
makortel Jan 23, 2014
1d95023
Fix SeedingLayerSetsHits::size() for nlayers_==0
makortel Jan 25, 2014
397034a
Pass GeomDetEnumerators::SubDetector to HitExtractorSTRP constructor
makortel Jan 24, 2014
41d3bf7
Restructure SeedingLayerSetsBuilder
makortel Jan 30, 2014
a38cc48
Change LogError to cms::Exception in SeedingLayerSetsBuilder::updateE…
makortel Jan 26, 2014
7277d79
Add theTTRHBuilders member to SeedingLayerSetsBuilder
makortel Jan 27, 2014
d95f0a6
Deliver TTRHBuilder to HitExtractor instead of SeedingLayer itself
makortel Jan 27, 2014
c50e5e0
Add SeedingLayersEDProducer-friendly interface to SeedingLayerSetsBui…
makortel Jan 27, 2014
c7bd459
Migrate SeedingLayerSetsHits and SeedingLayersEDProducer to the new i…
makortel Jan 27, 2014
d341db7
Return all hits and indices for each layer from SeedingLayerSetsBuild…
makortel Jan 27, 2014
31604c2
Deliver hits to SeedingLayerSetsHits with swap-style interface
makortel Jan 27, 2014
dae49c4
Fix typos
makortel Feb 5, 2014
d3a9f35
Switch AK5 to AK4 and IC5 to IC4 in all HLT configs
perrotta Feb 5, 2014
1957226
Add constructors taking edm::ConsumesCollector& to ClusterChecker and…
makortel Feb 6, 2014
13273b8
Some cleanup in PhotonConversionTrajectorySeedProducerFrom(SingleLeg|…
makortel Feb 6, 2014
6b9363b
Further fixes to configuration
makortel Feb 6, 2014
d161678
SeedingLayers ESP to EDP migration
Martin-Grunewald Feb 10, 2014
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
2 changes: 1 addition & 1 deletion Calibration/HcalIsolatedTrackReco/python/HITmixedPairRegGenerator_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
HITmixedPairRegGenerator = cms.EDProducer("SeedGeneratorFromRegionHitsEDProducer",
OrderedHitsFactoryPSet = cms.PSet(
ComponentName = cms.string('StandardHitPairGenerator'),
SeedingLayers = cms.string('MixedLayerPairs')
SeedingLayers = cms.InputTag('MixedLayerPairs')
),
SeedComparitorPSet = cms.PSet(
ComponentName = cms.string('none')
Expand Down
2 changes: 1 addition & 1 deletion Calibration/HcalIsolatedTrackReco/python/HITpixelPairRegGenerator_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
HITpixelPairRegGenerator = cms.EDProducer("SeedGeneratorFromRegionHitsEDProducer",
OrderedHitsFactoryPSet = cms.PSet(
ComponentName = cms.string('StandardHitPairGenerator'),
SeedingLayers = cms.string('PixelLayerPairs')
SeedingLayers = cms.InputTag('PixelLayerPairs')
),
SeedComparitorPSet = cms.PSet(
ComponentName = cms.string('none')
Expand Down
2 changes: 1 addition & 1 deletion Calibration/HcalIsolatedTrackReco/python/HITpixelTripletRegGenerator_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
HITpixelTripletRegGenerator = cms.EDProducer("SeedGeneratorFromRegionHitsEDProducer",
OrderedHitsFactoryPSet = cms.PSet(
ComponentName = cms.string('StandardHitTripletGenerator'),
SeedingLayers = cms.string('PixelLayerTriplets'),
SeedingLayers = cms.InputTag('PixelLayerTriplets'),
PixelTripletHLTGenerator = cms.PSet(
useBending = cms.bool(True),
useFixedPreFiltering = cms.bool(False),
Expand Down
8 changes: 8 additions & 0 deletions FastSimulation/Tracking/python/HLTPixelTracksProducer_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
)
)



hltFastPixelHitsVertex = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
hltFastPixelTracks = hltPixelTracks.clone()
hltFastPixelTracksRecover = hltPixelTracks.clone()
Expand All @@ -40,3 +42,9 @@
hltFastPVPixelTracks = hltPixelTracks.clone()
hltFastPVPixelTracksRecover = hltPixelTracks.clone()

hltPixelLayerPairs = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
hltPixelLayerTriplets = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
hltPixelLayerTripletsReg = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
hltPixelLayerTripletsHITHB = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
hltPixelLayerTripletsHITHE = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
hltMixedLayerPairs = FastSimulation.HighLevelTrigger.DummyModule_cfi.dummyModule.clone()
4 changes: 2 additions & 2 deletions FastSimulation/Tracking/python/IterativeDetachedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
# 'BPix1+BPix2+FPix1_neg',
# 'BPix1+FPix1_pos+FPix2_pos',
# 'BPix1+FPix1_neg+FPix2_neg']
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
iterativeDetachedTripletSeeds.layerList = pixellayertriplets.layerList
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
iterativeDetachedTripletSeeds.layerList = PixelLayerTriplets.layerList

# candidate producer
#from FastSimulation.Tracking.IterativeSecondCandidateProducer_cff import *
Expand Down
4 changes: 2 additions & 2 deletions FastSimulation/Tracking/python/IterativeInitialStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
# 'BPix1+BPix2+FPix1_neg',
# 'BPix1+FPix1_pos+FPix2_pos',
# 'BPix1+FPix1_neg+FPix2_neg']
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
iterativeInitialSeeds.layerList = pixellayertriplets.layerList
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
iterativeInitialSeeds.layerList = PixelLayerTriplets.layerList

# candidate producer
import FastSimulation.Tracking.TrackCandidateProducer_cfi
Expand Down
4 changes: 2 additions & 2 deletions FastSimulation/Tracking/python/IterativeLowPtTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
# 'BPix1+BPix2+FPix1_neg',
# 'BPix1+FPix1_pos+FPix2_pos',
# 'BPix1+FPix1_neg+FPix2_neg']
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
iterativeLowPtTripletSeeds.layerList = pixellayertriplets.layerList
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
iterativeLowPtTripletSeeds.layerList = PixelLayerTriplets.layerList

# candidate producer
import FastSimulation.Tracking.TrackCandidateProducer_cfi
Expand Down
4 changes: 2 additions & 2 deletions FastSimulation/Tracking/python/PixelTripletSeedProducer_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
# 'BPix1+BPix2+FPix1_neg',
# 'BPix1+FPix1_pos+FPix2_pos',
# 'BPix1+FPix1_neg+FPix2_neg']
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import pixellayertriplets
pixelTripletSeeds.layerList = pixellayertriplets.layerList
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import PixelLayerTriplets
pixelTripletSeeds.layerList = PixelLayerTriplets.layerList
Loading