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

Adding online modules and HLT menu changes #4813

Merged
merged 1 commit into from Jul 29, 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
820 changes: 580 additions & 240 deletions HLTrigger/Configuration/python/HLT_2014_Famos_cff.py

Large diffs are not rendered by default.

1,252 changes: 886 additions & 366 deletions HLTrigger/Configuration/python/HLT_2014_cff.py

Large diffs are not rendered by default.

2,991 changes: 2,790 additions & 201 deletions HLTrigger/Configuration/python/HLT_FULL_Famos_cff.py

Large diffs are not rendered by default.

3,432 changes: 3,105 additions & 327 deletions HLTrigger/Configuration/python/HLT_FULL_cff.py

Large diffs are not rendered by default.

680 changes: 480 additions & 200 deletions HLTrigger/Configuration/python/HLT_GRun_Famos_cff.py

Large diffs are not rendered by default.

1,112 changes: 786 additions & 326 deletions HLTrigger/Configuration/python/HLT_GRun_cff.py

Large diffs are not rendered by default.

52 changes: 36 additions & 16 deletions HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_1_1/HIon/V65 (CMSSW_7_1_3)
# /dev/CMSSW_7_1_1/HIon/V72 (CMSSW_7_1_3_HLT3)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_1/HIon/V65')
tableName = cms.string('/dev/CMSSW_7_1_1/HIon/V72')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -2016,43 +2016,63 @@
)
hltAntiKT4CaloJets = cms.EDProducer( "FastjetJetProducer",
Active_Area_Repeats = cms.int32( 5 ),
useMassDropTagger = cms.bool( False ),
doAreaFastjet = cms.bool( False ),
voronoiRfact = cms.double( 0.9 ),
muMin = cms.double( -1.0 ),
Ghost_EtaMax = cms.double( 6.0 ),
maxBadHcalCells = cms.uint32( 9999999 ),
doAreaDiskApprox = cms.bool( True ),
subtractorName = cms.string( "" ),
maxRecoveredEcalCells = cms.uint32( 9999999 ),
jetType = cms.string( "CaloJet" ),
muCut = cms.double( -1.0 ),
subjetPtMin = cms.double( -1.0 ),
useTrimming = cms.bool( False ),
minSeed = cms.uint32( 14327 ),
Ghost_EtaMax = cms.double( 6.0 ),
voronoiRfact = cms.double( 0.9 ),
doRhoFastjet = cms.bool( False ),
jetAlgorithm = cms.string( "AntiKt" ),
muMax = cms.double( -1.0 ),
nSigmaPU = cms.double( 1.0 ),
GhostArea = cms.double( 0.01 ),
Rho_EtaMax = cms.double( 4.4 ),
maxRecoveredHcalCells = cms.uint32( 9999999 ),
maxBadEcalCells = cms.uint32( 9999999 ),
yMin = cms.double( -1.0 ),
useFiltering = cms.bool( False ),
useDeterministicSeed = cms.bool( True ),
doPVCorrection = cms.bool( False ),
maxRecoveredHcalCells = cms.uint32( 9999999 ),
rFilt = cms.double( -1.0 ),
yMax = cms.double( -1.0 ),
zcut = cms.double( -1.0 ),
MinVtxNdof = cms.int32( 5 ),
MaxVtxZ = cms.double( 15.0 ),
rParam = cms.double( 0.4 ),
UseOnlyVertexTracks = cms.bool( False ),
dRMin = cms.double( -1.0 ),
nFilt = cms.int32( -1 ),
usePruning = cms.bool( False ),
maxDepth = cms.int32( -1 ),
yCut = cms.double( -1.0 ),
DzTrVtxMax = cms.double( 0.0 ),
UseOnlyOnePV = cms.bool( False ),
maxProblematicHcalCells = cms.uint32( 9999999 ),
rcut_factor = cms.double( -1.0 ),
doOutputJets = cms.bool( True ),
src = cms.InputTag( "hltTowerMakerForAll" ),
inputEtMin = cms.double( 0.3 ),
sumRecHits = cms.bool( False ),
jetPtMin = cms.double( 1.0 ),
puPtMin = cms.double( 10.0 ),
srcPVs = cms.InputTag( "NotUsed" ),
jetPtMin = cms.double( 1.0 ),
inputEtMin = cms.double( 0.3 ),
trimPtFracMin = cms.double( -1.0 ),
radiusPU = cms.double( 0.4 ),
dRMax = cms.double( -1.0 ),
DxyTrVtxMax = cms.double( 0.0 ),
maxProblematicEcalCells = cms.uint32( 9999999 ),
useCMSBoostedTauSeedingAlgorithm = cms.bool( False ),
doPUOffsetCorr = cms.bool( False ),
inputEMin = cms.double( 0.0 ),
subtractorName = cms.string( "" ),
MinVtxNdof = cms.int32( 5 ),
MaxVtxZ = cms.double( 15.0 ),
UseOnlyVertexTracks = cms.bool( False ),
UseOnlyOnePV = cms.bool( False ),
DzTrVtxMax = cms.double( 0.0 ),
sumRecHits = cms.bool( False ),
DxyTrVtxMax = cms.double( 0.0 )
inputEMin = cms.double( 0.0 )
)
hltCaloJetIDPassed = cms.EDProducer( "HLTCaloJetIDProducer",
min_N90 = cms.int32( -2 ),
Expand Down
52 changes: 36 additions & 16 deletions HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,10 +1,10 @@
# /dev/CMSSW_7_1_1/PIon/V65 (CMSSW_7_1_3)
# /dev/CMSSW_7_1_1/PIon/V72 (CMSSW_7_1_3_HLT3)

import FWCore.ParameterSet.Config as cms


HLTConfigVersion = cms.PSet(
tableName = cms.string('/dev/CMSSW_7_1_1/PIon/V65')
tableName = cms.string('/dev/CMSSW_7_1_1/PIon/V72')
)

HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -4768,43 +4768,63 @@
)
hltAntiKT4CaloJets = cms.EDProducer( "FastjetJetProducer",
Active_Area_Repeats = cms.int32( 5 ),
useMassDropTagger = cms.bool( False ),
doAreaFastjet = cms.bool( False ),
voronoiRfact = cms.double( 0.9 ),
muMin = cms.double( -1.0 ),
Ghost_EtaMax = cms.double( 6.0 ),
maxBadHcalCells = cms.uint32( 9999999 ),
doAreaDiskApprox = cms.bool( True ),
subtractorName = cms.string( "" ),
maxRecoveredEcalCells = cms.uint32( 9999999 ),
jetType = cms.string( "CaloJet" ),
muCut = cms.double( -1.0 ),
subjetPtMin = cms.double( -1.0 ),
useTrimming = cms.bool( False ),
minSeed = cms.uint32( 14327 ),
Ghost_EtaMax = cms.double( 6.0 ),
voronoiRfact = cms.double( 0.9 ),
doRhoFastjet = cms.bool( False ),
jetAlgorithm = cms.string( "AntiKt" ),
muMax = cms.double( -1.0 ),
nSigmaPU = cms.double( 1.0 ),
GhostArea = cms.double( 0.01 ),
Rho_EtaMax = cms.double( 4.4 ),
maxRecoveredHcalCells = cms.uint32( 9999999 ),
maxBadEcalCells = cms.uint32( 9999999 ),
yMin = cms.double( -1.0 ),
useFiltering = cms.bool( False ),
useDeterministicSeed = cms.bool( True ),
doPVCorrection = cms.bool( False ),
maxRecoveredHcalCells = cms.uint32( 9999999 ),
rFilt = cms.double( -1.0 ),
yMax = cms.double( -1.0 ),
zcut = cms.double( -1.0 ),
MinVtxNdof = cms.int32( 5 ),
MaxVtxZ = cms.double( 15.0 ),
rParam = cms.double( 0.4 ),
UseOnlyVertexTracks = cms.bool( False ),
dRMin = cms.double( -1.0 ),
nFilt = cms.int32( -1 ),
usePruning = cms.bool( False ),
maxDepth = cms.int32( -1 ),
yCut = cms.double( -1.0 ),
DzTrVtxMax = cms.double( 0.0 ),
UseOnlyOnePV = cms.bool( False ),
maxProblematicHcalCells = cms.uint32( 9999999 ),
rcut_factor = cms.double( -1.0 ),
doOutputJets = cms.bool( True ),
src = cms.InputTag( "hltTowerMakerForAll" ),
inputEtMin = cms.double( 0.3 ),
sumRecHits = cms.bool( False ),
jetPtMin = cms.double( 1.0 ),
puPtMin = cms.double( 10.0 ),
srcPVs = cms.InputTag( "NotUsed" ),
jetPtMin = cms.double( 1.0 ),
inputEtMin = cms.double( 0.3 ),
trimPtFracMin = cms.double( -1.0 ),
radiusPU = cms.double( 0.4 ),
dRMax = cms.double( -1.0 ),
DxyTrVtxMax = cms.double( 0.0 ),
maxProblematicEcalCells = cms.uint32( 9999999 ),
useCMSBoostedTauSeedingAlgorithm = cms.bool( False ),
doPUOffsetCorr = cms.bool( False ),
inputEMin = cms.double( 0.0 ),
subtractorName = cms.string( "" ),
MinVtxNdof = cms.int32( 5 ),
MaxVtxZ = cms.double( 15.0 ),
UseOnlyVertexTracks = cms.bool( False ),
UseOnlyOnePV = cms.bool( False ),
DzTrVtxMax = cms.double( 0.0 ),
sumRecHits = cms.bool( False ),
DxyTrVtxMax = cms.double( 0.0 )
inputEMin = cms.double( 0.0 )
)
hltCaloJetIDPassed = cms.EDProducer( "HLTCaloJetIDProducer",
min_N90 = cms.int32( -2 ),
Expand Down
2 changes: 2 additions & 0 deletions HLTrigger/Configuration/python/Tools/confdb.py
Expand Up @@ -938,6 +938,8 @@ def buildOptions(self):

self.options['services'].append( "-MessageLogger" )
self.options['services'].append( "-DQMStore" )
self.options['services'].append( "-EvFDaqDirector" )
self.options['services'].append( "-FastMonitoringService" )
self.options['services'].append( "-MicroStateService" )
self.options['services'].append( "-ModuleWebRegistry" )
self.options['services'].append( "-TimeProfilerService" )
Expand Down
10 changes: 10 additions & 0 deletions HLTrigger/Configuration/tables/GRun.txt
Expand Up @@ -53,6 +53,16 @@ HLT_Ele17_Ele12_Ele10_CaloId_TrackId_v* # JIRA: CMSHLT-78
HLT_Mu23_TrkIsoVVL_Ele12_Gsf_CaloId_TrackId_Iso_MediumWP_v* # JIRA: CMSHLT-78
HLT_Mu8_TrkIsoVVL_Ele23_Gsf_CaloId_TrackId_Iso_MediumWP_v* # JIRA: CMSHLT-78

#HLT_DoubleMu4_3_Bs_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_DoubleMu4_3_Jpsi_Displaced_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_Dimuon20_Jpsi_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_Dimuon13_PsiPrime_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_Dimuon13_Upsilon_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_Mu25_TkMu0_dEta18_Onia_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_DoubleMu4_JpsiTrk_Displaced_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_DoubleMu4_PsiPrimeTrk_Displaced_v* # JIRA: CMSHLT-82, no DQM yet
#HLT_DoubleMu4_LowMassNonResonantTrk_Displaced_v* # JIRA: CMSHLT-82, no DQM yet

#DQM_FEDIntegrity_v*
HLTriggerFirstPath
HLTriggerFinalPath
Expand Down