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.

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

Fix electron GSF sequence for fastsim HLT (74X) #6769

Merged
merged 2 commits into from Dec 4, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
@@ -0,0 +1,18 @@
from FastSimulation.EgammaElectronAlgos.electronGSGsfTrackCandidates_cff import *
import TrackingTools.GsfTracking.GsfElectronFit_cfi

# This should be similar to
# from FastSimulation.Configuration.StandardSequences_cff import iterativeTrackingBeginning
# from FastSimulation.Configuration.StandardSequences_cff import famosGsfTrackSequence

hltEgammaCkfTrackCandidatesForGSF = electronGSGsfTrackCandidates.clone()
hltEgammaCkfTrackCandidatesForGSF.SeedProducer = "hltEgammaElectronPixelSeeds"
hltEgammaGsfTracks = TrackingTools.GsfTracking.GsfElectronFit_cfi.GsfGlobalElectronTest.clone()
hltEgammaGsfTracks.src = 'hltEgammaCkfTrackCandidatesForGSF'
hltEgammaGsfTracks.TTRHBuilder = 'WithoutRefit'
hltEgammaGsfTracks.TrajectoryInEvent = True

hltEgammaCkfTrackCandidatesForGSFUnseeded = electronGSGsfTrackCandidates.clone()
hltEgammaCkfTrackCandidatesForGSFUnseeded.SeedProducer = "hltEgammaElectronPixelSeedsUnseeded"
hltEgammaGsfTracksUnseeded = hltEgammaGsfTracks.clone()
hltEgammaGsfTracksUnseeded.src = 'hltEgammaCkfTrackCandidatesForGSFUnseeded'
@@ -1,5 +1,8 @@
import FWCore.ParameterSet.Config as cms

# Tracking for electrons
from FastSimulation.EgammaElectronAlgos.hltElectronGsfTracks_cff import *

# Seeding for electrons (activities)
from FastSimulation.EgammaElectronAlgos.pixelMatchElectronActivitySequenceForHLT_cff import *
# Seeding for electrons (small windows)
Expand Down
70 changes: 0 additions & 70 deletions HLTrigger/Configuration/python/HLT_FULL_Famos_cff.py
Expand Up @@ -5617,41 +5617,6 @@
s_a_zB = cms.double( 0.012 ),
s_a_phi2F = cms.double( 0.00906 )
)
hltEgammaCkfTrackCandidatesForGSF = cms.EDProducer( "CkfTrackCandidateMaker",
src = cms.InputTag( "hltEgammaElectronPixelSeeds" ),
maxSeedsBeforeCleaning = cms.uint32( 1000 ),
SimpleMagneticField = cms.string( "" ),
TransientInitialStateEstimatorParameters = cms.PSet(
propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ),
numberMeasurementsForFit = cms.int32( 4 ),
propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" )
),
TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
cleanTrajectoryAfterInOut = cms.bool( True ),
useHitsSplitting = cms.bool( True ),
RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ),
doSeedingRegionRebuilding = cms.bool( True ),
maxNSeeds = cms.uint32( 1000000 ),
TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetTrajectoryBuilderForElectrons" ) ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryBuilder = cms.string( "" )
)
hltEgammaGsfTracks = cms.EDProducer( "GsfTrackProducer",
src = cms.InputTag( "hltEgammaCkfTrackCandidatesForGSF" ),
beamSpot = cms.InputTag( "offlineBeamSpot" ),
producer = cms.string( "" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
Fitter = cms.string( "hltESPGsfElectronFittingSmoother" ),
useHitsSplitting = cms.bool( False ),
MeasurementTracker = cms.string( "hltESPMeasurementTracker" ),
AlgorithmName = cms.string( "gsf" ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryInEvent = cms.bool( True ),
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
GeometricInnerState = cms.bool( True ),
Propagator = cms.string( "hltESPFwdElectronPropagator" )
)
hltEgammaGsfElectrons = cms.EDProducer( "EgammaHLTPixelMatchElectronProducers",
BSProducer = cms.InputTag( "offlineBeamSpot" ),
UseGsfTracks = cms.bool( True ),
Expand Down Expand Up @@ -6251,41 +6216,6 @@
s_a_zB = cms.double( 0.012 ),
s_a_phi2F = cms.double( 0.00906 )
)
hltEgammaCkfTrackCandidatesForGSFUnseeded = cms.EDProducer( "CkfTrackCandidateMaker",
src = cms.InputTag( "hltEgammaElectronPixelSeedsUnseeded" ),
maxSeedsBeforeCleaning = cms.uint32( 1000 ),
SimpleMagneticField = cms.string( "" ),
TransientInitialStateEstimatorParameters = cms.PSet(
propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ),
numberMeasurementsForFit = cms.int32( 4 ),
propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" )
),
TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
cleanTrajectoryAfterInOut = cms.bool( True ),
useHitsSplitting = cms.bool( True ),
RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ),
doSeedingRegionRebuilding = cms.bool( True ),
maxNSeeds = cms.uint32( 1000000 ),
TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetTrajectoryBuilderForElectrons" ) ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryBuilder = cms.string( "" )
)
hltEgammaGsfTracksUnseeded = cms.EDProducer( "GsfTrackProducer",
src = cms.InputTag( "hltEgammaCkfTrackCandidatesForGSFUnseeded" ),
beamSpot = cms.InputTag( "offlineBeamSpot" ),
producer = cms.string( "" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
Fitter = cms.string( "hltESPGsfElectronFittingSmoother" ),
useHitsSplitting = cms.bool( False ),
MeasurementTracker = cms.string( "hltESPMeasurementTracker" ),
AlgorithmName = cms.string( "gsf" ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryInEvent = cms.bool( True ),
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
GeometricInnerState = cms.bool( True ),
Propagator = cms.string( "hltESPFwdElectronPropagator" )
)
hltEgammaGsfElectronsUnseeded = cms.EDProducer( "EgammaHLTPixelMatchElectronProducers",
BSProducer = cms.InputTag( "offlineBeamSpot" ),
UseGsfTracks = cms.bool( True ),
Expand Down
70 changes: 0 additions & 70 deletions HLTrigger/Configuration/python/HLT_Fake_Famos_cff.py
Expand Up @@ -6027,41 +6027,6 @@
s_a_zB = cms.double( 0.012 ),
s_a_phi2F = cms.double( 0.00906 )
)
hltEgammaCkfTrackCandidatesForGSF = cms.EDProducer( "CkfTrackCandidateMaker",
src = cms.InputTag( "hltEgammaElectronPixelSeeds" ),
maxSeedsBeforeCleaning = cms.uint32( 1000 ),
SimpleMagneticField = cms.string( "" ),
TransientInitialStateEstimatorParameters = cms.PSet(
propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ),
numberMeasurementsForFit = cms.int32( 4 ),
propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" )
),
TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
cleanTrajectoryAfterInOut = cms.bool( True ),
useHitsSplitting = cms.bool( True ),
RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ),
doSeedingRegionRebuilding = cms.bool( True ),
maxNSeeds = cms.uint32( 1000000 ),
TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetTrajectoryBuilderForElectrons" ) ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryBuilder = cms.string( "" )
)
hltEgammaGsfTracks = cms.EDProducer( "GsfTrackProducer",
src = cms.InputTag( "hltEgammaCkfTrackCandidatesForGSF" ),
beamSpot = cms.InputTag( "offlineBeamSpot" ),
producer = cms.string( "" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
Fitter = cms.string( "hltESPGsfElectronFittingSmoother" ),
useHitsSplitting = cms.bool( False ),
MeasurementTracker = cms.string( "hltESPMeasurementTracker" ),
AlgorithmName = cms.string( "gsf" ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryInEvent = cms.bool( True ),
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
GeometricInnerState = cms.bool( True ),
Propagator = cms.string( "hltESPFwdElectronPropagator" )
)
hltEgammaGsfElectrons = cms.EDProducer( "EgammaHLTPixelMatchElectronProducers",
BSProducer = cms.InputTag( "offlineBeamSpot" ),
UseGsfTracks = cms.bool( True ),
Expand Down Expand Up @@ -7088,41 +7053,6 @@
s_a_zB = cms.double( 0.012 ),
s_a_phi2F = cms.double( 0.00906 )
)
hltEgammaCkfTrackCandidatesForGSFUnseeded = cms.EDProducer( "CkfTrackCandidateMaker",
src = cms.InputTag( "hltEgammaElectronPixelSeedsUnseeded" ),
maxSeedsBeforeCleaning = cms.uint32( 1000 ),
SimpleMagneticField = cms.string( "" ),
TransientInitialStateEstimatorParameters = cms.PSet(
propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ),
numberMeasurementsForFit = cms.int32( 4 ),
propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" )
),
TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
cleanTrajectoryAfterInOut = cms.bool( True ),
useHitsSplitting = cms.bool( True ),
RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ),
doSeedingRegionRebuilding = cms.bool( True ),
maxNSeeds = cms.uint32( 1000000 ),
TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetTrajectoryBuilderForElectrons" ) ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryBuilder = cms.string( "" )
)
hltEgammaGsfTracksUnseeded = cms.EDProducer( "GsfTrackProducer",
src = cms.InputTag( "hltEgammaCkfTrackCandidatesForGSFUnseeded" ),
beamSpot = cms.InputTag( "offlineBeamSpot" ),
producer = cms.string( "" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
Fitter = cms.string( "hltESPGsfElectronFittingSmoother" ),
useHitsSplitting = cms.bool( False ),
MeasurementTracker = cms.string( "hltESPMeasurementTracker" ),
AlgorithmName = cms.string( "gsf" ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryInEvent = cms.bool( True ),
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
GeometricInnerState = cms.bool( True ),
Propagator = cms.string( "hltESPFwdElectronPropagator" )
)
hltEgammaGsfElectronsUnseeded = cms.EDProducer( "EgammaHLTPixelMatchElectronProducers",
BSProducer = cms.InputTag( "offlineBeamSpot" ),
UseGsfTracks = cms.bool( True ),
Expand Down
70 changes: 0 additions & 70 deletions HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py
Expand Up @@ -5354,41 +5354,6 @@
s_a_zB = cms.double( 0.012 ),
s_a_phi2F = cms.double( 0.00906 )
)
hltEgammaCkfTrackCandidatesForGSF = cms.EDProducer( "CkfTrackCandidateMaker",
src = cms.InputTag( "hltEgammaElectronPixelSeeds" ),
maxSeedsBeforeCleaning = cms.uint32( 1000 ),
SimpleMagneticField = cms.string( "" ),
TransientInitialStateEstimatorParameters = cms.PSet(
propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ),
numberMeasurementsForFit = cms.int32( 4 ),
propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" )
),
TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
cleanTrajectoryAfterInOut = cms.bool( True ),
useHitsSplitting = cms.bool( True ),
RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ),
doSeedingRegionRebuilding = cms.bool( True ),
maxNSeeds = cms.uint32( 1000000 ),
TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetTrajectoryBuilderForElectrons" ) ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryBuilder = cms.string( "" )
)
hltEgammaGsfTracks = cms.EDProducer( "GsfTrackProducer",
src = cms.InputTag( "hltEgammaCkfTrackCandidatesForGSF" ),
beamSpot = cms.InputTag( "offlineBeamSpot" ),
producer = cms.string( "" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
Fitter = cms.string( "hltESPGsfElectronFittingSmoother" ),
useHitsSplitting = cms.bool( False ),
MeasurementTracker = cms.string( "hltESPMeasurementTracker" ),
AlgorithmName = cms.string( "gsf" ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryInEvent = cms.bool( True ),
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
GeometricInnerState = cms.bool( True ),
Propagator = cms.string( "hltESPFwdElectronPropagator" )
)
hltEgammaGsfElectrons = cms.EDProducer( "EgammaHLTPixelMatchElectronProducers",
BSProducer = cms.InputTag( "offlineBeamSpot" ),
UseGsfTracks = cms.bool( True ),
Expand Down Expand Up @@ -5988,41 +5953,6 @@
s_a_zB = cms.double( 0.012 ),
s_a_phi2F = cms.double( 0.00906 )
)
hltEgammaCkfTrackCandidatesForGSFUnseeded = cms.EDProducer( "CkfTrackCandidateMaker",
src = cms.InputTag( "hltEgammaElectronPixelSeedsUnseeded" ),
maxSeedsBeforeCleaning = cms.uint32( 1000 ),
SimpleMagneticField = cms.string( "" ),
TransientInitialStateEstimatorParameters = cms.PSet(
propagatorAlongTISE = cms.string( "PropagatorWithMaterial" ),
numberMeasurementsForFit = cms.int32( 4 ),
propagatorOppositeTISE = cms.string( "PropagatorWithMaterialOpposite" )
),
TrajectoryCleaner = cms.string( "hltESPTrajectoryCleanerBySharedHits" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
cleanTrajectoryAfterInOut = cms.bool( True ),
useHitsSplitting = cms.bool( True ),
RedundantSeedCleaner = cms.string( "CachingSeedCleanerBySharedInput" ),
doSeedingRegionRebuilding = cms.bool( True ),
maxNSeeds = cms.uint32( 1000000 ),
TrajectoryBuilderPSet = cms.PSet( refToPSet_ = cms.string( "HLTPSetTrajectoryBuilderForElectrons" ) ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryBuilder = cms.string( "" )
)
hltEgammaGsfTracksUnseeded = cms.EDProducer( "GsfTrackProducer",
src = cms.InputTag( "hltEgammaCkfTrackCandidatesForGSFUnseeded" ),
beamSpot = cms.InputTag( "offlineBeamSpot" ),
producer = cms.string( "" ),
MeasurementTrackerEvent = cms.InputTag( "MeasurementTrackerEvent" ),
Fitter = cms.string( "hltESPGsfElectronFittingSmoother" ),
useHitsSplitting = cms.bool( False ),
MeasurementTracker = cms.string( "hltESPMeasurementTracker" ),
AlgorithmName = cms.string( "gsf" ),
NavigationSchool = cms.string( "SimpleNavigationSchool" ),
TrajectoryInEvent = cms.bool( True ),
TTRHBuilder = cms.string( "hltESPTTRHBWithTrackAngle" ),
GeometricInnerState = cms.bool( True ),
Propagator = cms.string( "hltESPFwdElectronPropagator" )
)
hltEgammaGsfElectronsUnseeded = cms.EDProducer( "EgammaHLTPixelMatchElectronProducers",
BSProducer = cms.InputTag( "offlineBeamSpot" ),
UseGsfTracks = cms.bool( True ),
Expand Down
5 changes: 5 additions & 0 deletions HLTrigger/Configuration/python/Tools/confdb.py
Expand Up @@ -1087,6 +1087,11 @@ def buildOptions(self):
self.options['modules'].append( "-hltESRawToRecHitFacility" )
self.options['modules'].append( "-hltEcalRecHitAll" )
self.options['modules'].append( "-hltESRecHitAll" )
# === eGamma
self.options['modules'].append( "-hltEgammaCkfTrackCandidatesForGSF" )
self.options['modules'].append( "-hltEgammaGsfTracks" )
self.options['modules'].append( "-hltEgammaCkfTrackCandidatesForGSFUnseeded" )
self.options['modules'].append( "-hltEgammaGsfTracksUnseeded" )
# === hltPF
self.options['modules'].append( "-hltPFJetCkfTrackCandidates" )
self.options['modules'].append( "-hltPFJetCtfWithMaterialTracks" )
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnData_HLT_FULL.py
Expand Up @@ -43996,8 +43996,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_FULL_DATA.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnData_HLT_Fake.py
Expand Up @@ -29424,8 +29424,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_Fake_DATA.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnData_HLT_GRun.py
Expand Up @@ -40090,8 +40090,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_GRun_DATA.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnData_HLT_HIon.py
Expand Up @@ -8431,8 +8431,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_HIon_DATA.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnData_HLT_PIon.py
Expand Up @@ -8431,8 +8431,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_PIon_DATA.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnMc_HLT_FULL.py
Expand Up @@ -43996,8 +43996,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_FULL_MC.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnMc_HLT_Fake.py
Expand Up @@ -29424,8 +29424,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_Fake_MC.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnMc_HLT_GRun.py
Expand Up @@ -40090,8 +40090,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_GRun_MC.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnMc_HLT_HIon.py
Expand Up @@ -8431,8 +8431,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_HIon_MC.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down
2 changes: 0 additions & 2 deletions HLTrigger/Configuration/test/OnMc_HLT_PIon.py
Expand Up @@ -8431,8 +8431,6 @@
fileNames = cms.untracked.vstring(
'file:RelVal_Raw_PIon_MC.root',
),
secondaryFileNames = cms.untracked.vstring(
),
inputCommands = cms.untracked.vstring(
'keep *'
)
Expand Down