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

HLT updates on top of the menu in CMSSW_744 - 75X #9406

Merged
merged 22 commits into from Jun 10, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
2,557 changes: 1,544 additions & 1,013 deletions HLTrigger/Configuration/python/HLT_50nsGRun_cff.py

Large diffs are not rendered by default.

1,364 changes: 753 additions & 611 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

1,885 changes: 1,173 additions & 712 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py

Large diffs are not rendered by default.

98 changes: 7 additions & 91 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -1,11 +1,11 @@
# /dev/CMSSW_7_4_0/HIon/V66 (CMSSW_7_4_3)
# /dev/CMSSW_7_4_0/HIon/V74 (CMSSW_7_4_3)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_4_0/HIon/V66')
tableName = cms.string('/dev/CMSSW_7_4_0/HIon/V74')
)

fragment.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -580,50 +580,6 @@
nthTrack = cms.int32( 2 ),
useSignedImpactParameterSig = cms.bool( True )
)
fragment.hltESPAK8CaloCorrection = cms.ESProducer( "JetCorrectionESChain",
correctors = cms.vstring( 'hltESPAK8CaloFastJetCorrectionESProducer',
'hltESPAK8CaloRelativeCorrectionESProducer',
'hltESPAK8CaloAbsoluteCorrectionESProducer' ),
appendToDataLabel = cms.string( "" )
)
fragment.hltESPAK8CaloFastJetCorrectionESProducer = cms.ESProducer( "L1FastjetCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
srcRho = cms.InputTag( "hltFixedGridRhoFastjetAllCalo" ),
algorithm = cms.string( "AK8CaloHLT" ),
level = cms.string( "L1FastJet" )
)
fragment.hltESPAK8CaloRelativeCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
algorithm = cms.string( "AK8CaloHLT" ),
level = cms.string( "L2Relative" )
)
fragment.hltESPAK8CaloAbsoluteCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
algorithm = cms.string( "AK8CaloHLT" ),
level = cms.string( "L3Absolute" )
)
fragment.hltESPAK8PFCorrection = cms.ESProducer( "JetCorrectionESChain",
correctors = cms.vstring( 'hltESPAK8PFFastJetCorrectionESProducer',
'hltESPAK8PFRelativeCorrectionESProducer',
'hltESPAK8PFAbsoluteCorrectionESProducer' ),
appendToDataLabel = cms.string( "" )
)
fragment.hltESPAK8PFFastJetCorrectionESProducer = cms.ESProducer( "L1FastjetCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
srcRho = cms.InputTag( "hltFixedGridRhoFastjetAll" ),
algorithm = cms.string( "AK8PFHLT" ),
level = cms.string( "L1FastJet" )
)
fragment.hltESPAK8PFRelativeCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
algorithm = cms.string( "AK8PFHLT" ),
level = cms.string( "L2Relative" )
)
fragment.hltESPAK8PFAbsoluteCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
algorithm = cms.string( "AK8PFHLT" ),
level = cms.string( "L3Absolute" )
)
fragment.hltDisplacedDijethltESPTrackCounting2D1st = cms.ESProducer( "TrackCountingESProducer",
b_pT = cms.double( 0.3684 ),
deltaR = cms.double( -1.0 ),
Expand Down Expand Up @@ -657,50 +613,6 @@
maximumDistanceToJetAxis = cms.double( 999999.0 ),
nthTrack = cms.int32( -1 )
)
fragment.hltESPAK4CaloCorrection = cms.ESProducer( "JetCorrectionESChain",
correctors = cms.vstring( 'hltESPAK4CaloFastJetCorrectionESProducer',
'hltESPAK4CaloRelativeCorrectionESProducer',
'hltESPAK4CaloAbsoluteCorrectionESProducer' ),
appendToDataLabel = cms.string( "" )
)
fragment.hltESPAK4PFCorrection = cms.ESProducer( "JetCorrectionESChain",
correctors = cms.vstring( 'hltESPAK4PFFastJetCorrectionESProducer',
'hltESPAK4PFRelativeCorrectionESProducer',
'hltESPAK4PFAbsoluteCorrectionESProducer' ),
appendToDataLabel = cms.string( "" )
)
fragment.hltESPAK4CaloFastJetCorrectionESProducer = cms.ESProducer( "L1FastjetCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
srcRho = cms.InputTag( "hltFixedGridRhoFastjetAllCalo" ),
algorithm = cms.string( "AK4CaloHLT" ),
level = cms.string( "L1FastJet" )
)
fragment.hltESPAK4PFFastJetCorrectionESProducer = cms.ESProducer( "L1FastjetCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
srcRho = cms.InputTag( "hltFixedGridRhoFastjetAll" ),
algorithm = cms.string( "AK4PFHLT" ),
level = cms.string( "L1FastJet" )
)
fragment.hltESPAK4PFRelativeCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
algorithm = cms.string( "AK4PFHLT" ),
level = cms.string( "L2Relative" )
)
fragment.hltESPAK4CaloRelativeCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
algorithm = cms.string( "AK4CaloHLT" ),
level = cms.string( "L2Relative" )
)
fragment.hltESPAK4CaloAbsoluteCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
algorithm = cms.string( "AK4CaloHLT" ),
level = cms.string( "L3Absolute" )
)
fragment.hltESPAK4PFAbsoluteCorrectionESProducer = cms.ESProducer( "LXXXCorrectionESProducer",
appendToDataLabel = cms.string( "" ),
algorithm = cms.string( "AK4PFHLT" ),
level = cms.string( "L3Absolute" )
)
fragment.MaterialPropagatorParabolicMF = cms.ESProducer( "PropagatorWithMaterialESProducer",
SimpleMagneticField = cms.string( "ParabolicMf" ),
PropagationDirection = cms.string( "alongMomentum" ),
Expand Down Expand Up @@ -3395,6 +3307,10 @@
fragment.hltTriggerSummaryRAW = cms.EDProducer( "TriggerSummaryProducerRAW",
processName = cms.string( "@" )
)
fragment.hltPreAnalyzerEndpath = cms.EDFilter( "HLTPrescaler",
L1GtReadoutRecordTag = cms.InputTag( "hltGtDigis" ),
offset = cms.uint32( 0 )
)
fragment.hltL1GtTrigReport = cms.EDAnalyzer( "L1GtTrigReport",
PrintVerbosity = cms.untracked.int32( 10 ),
UseL1GlobalTriggerRecord = cms.bool( False ),
Expand Down Expand Up @@ -3439,7 +3355,7 @@
fragment.HLT_HIL3DoubleMuOpen_OS_v2 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1DoubleMuOpenBptxAND + fragment.hltPreHIL3DoubleMuOpenOS + fragment.hltHIDoubleMuLevel1PathL1OpenFiltered + fragment.HLTL2muonrecoSequence + fragment.hltHIDimuonL2PreFiltered0 + fragment.HLTHIL3muonrecoSequence + fragment.hltHIDimuonL3FilterOpenOS + fragment.HLTEndSequence )
fragment.HLT_HIL3DoubleMuOpen_OS_NoCowboy_v2 = cms.Path( fragment.HLTBeginSequence + fragment.hltL1sL1DoubleMuOpenBptxAND + fragment.hltPreHIL3DoubleMuOpenOSNoCowboy + fragment.hltHIDoubleMuLevel1PathL1OpenFiltered + fragment.HLTL2muonrecoSequence + fragment.hltHIDimuonL2PreFiltered0 + fragment.HLTHIL3muonrecoSequence + fragment.hltHIDimuonL3FilterOpenOSNoCowboy + fragment.HLTEndSequence )
fragment.HLTriggerFinalPath = cms.Path( fragment.hltGtDigis + fragment.hltScalersRawToDigi + fragment.hltFEDSelector + fragment.hltTriggerSummaryAOD + fragment.hltTriggerSummaryRAW + fragment.hltBoolFalse )
fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltL1GtTrigReport + fragment.hltTrigReport )
fragment.HLTAnalyzerEndpath = cms.EndPath( fragment.hltPreAnalyzerEndpath + fragment.hltL1GtTrigReport + fragment.hltTrigReport )


fragment.HLTSchedule = cms.Schedule( *(fragment.HLTriggerFirstPath, fragment.HLT_Physics_v2, fragment.HLT_HIL1DoubleMu0_HighQ_v2, fragment.HLT_HIL2Mu3_v2, fragment.HLT_HIL2Mu7_v2, fragment.HLT_HIL2Mu15_v2, fragment.HLT_HIL2Mu3_NHitQ_v2, fragment.HLT_HIL2DoubleMu0_v2, fragment.HLT_HIL2DoubleMu0_NHitQ_v2, fragment.HLT_HIL2DoubleMu3_v2, fragment.HLT_HIL3Mu3_v2, fragment.HLT_HIL3DoubleMuOpen_v2, fragment.HLT_HIL3DoubleMuOpen_SS_v2, fragment.HLT_HIL3DoubleMuOpen_OS_v2, fragment.HLT_HIL3DoubleMuOpen_OS_NoCowboy_v2, fragment.HLTriggerFinalPath, fragment.HLTAnalyzerEndpath ))
Expand Down