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

Cleanup (following #17098) for HLT ConfDB parsing #17438

Merged
merged 2 commits into from Feb 7, 2017
Merged

Cleanup (following #17098) for HLT ConfDB parsing #17438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
163bdb7
Cleanup following #17098 for HLT
Martin-Grunewald Feb 7, 2017
1969bd5
PixelTracks_cfi replaced by generated pixelTracksDefault_cfi
Martin-Grunewald Feb 7, 2017
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
4 changes: 2 additions & 2 deletions RecoTauTag/HLTProducers/python/PixelTracksL2Tau_cfi.py
View file
Open in desktop
@@ -1,9 +1,9 @@
import FWCore.ParameterSet.Config as cms

from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cfi import *
from RecoPixelVertexing.PixelTrackFitting.pixelTracksDefault_cfi import *
from RecoTauTag.HLTProducers.TrackingRegionsFromBeamSpotAndL2Tau_cfi import *

pixelTracksL2Tau = pixelTracks.clone()
pixelTracksL2Tau = pixelTracksDefault.clone()
pixelTracksL2Tau.RegionFactoryPSet = cms.PSet(
TrackingRegionsFromBeamSpotAndL2TauBlock,
ComponentName = cms.string( "TrackingRegionsFromBeamSpotAndL2Tau" )
Expand Down
1 change: 0 additions & 1 deletion RecoTracker/DeDx/python/hltDeDxEstimatorProducer_cfi.py
View file
Open in desktop
Expand Up @@ -5,4 +5,3 @@

DeDxEstimatorProducer = dedxHarmonic2.clone()
DeDxEstimatorProducer.tracks=cms.InputTag("hltIter4Merged")
DeDxEstimatorProducer.trajectoryTrackAssociation = cms.InputTag("hltIter4Merged")
2 changes: 1 addition & 1 deletion RecoTracker/TkSeedGenerator/python/SeedGeneratorFromProtoTracksEDProducer_cff.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
pixelTTRHBuilderWithoutAngle = copy.deepcopy(ttrhbwr)
from RecoTracker.TkSeedingLayers.TTRHBuilderWithoutAngle4PixelTriplets_cfi import *
from RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi import *
from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cfi import *
from RecoPixelVertexing.PixelTrackFitting.pixelTracksDefault_cfi import *
Copy link
Contributor

Choose a reason for hiding this comment

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

Whoops, something I missed in #17170. More proper solution would be to add pixelTracks_cfi.py, move

pixelTracks = _pixelTracksDefault.clone()
_SeedingHitSets = dict(SeedingHitSets = "pixelTracksHitQuadruplets")
trackingPhase1PU70.toModify(pixelTracks, **_SeedingHitSets)
trackingPhase2PU140.toModify(pixelTracks, **_SeedingHitSets)

from RecoPixelVertexing/PixelTrackFitting/python/PixelTracks_cff.py there, and fix all imports.

@Martin-Grunewald Depending on your preference, I can do it now, after this PR, or leave it to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@makortel
Please you do that part after this PR as I am not the expert in this... Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok.

from RecoTracker.TkSeedGenerator.SeedGeneratorFromProtoTracksEDProducer_cfi import *
pixelTTRHBuilderWithoutAngle.StripCPE = 'Fake'
pixelTTRHBuilderWithoutAngle.ComponentName = 'PixelTTRHBuilderWithoutAngle'
Expand Down