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

HLT updates on top of the menus merged right after CMSSW_745 - 75X #9775

Closed
wants to merge 45 commits into from
Closed

HLT updates on top of the menus merged right after CMSSW_745 - 75X #9775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
1a54f6e
HLT menus updates
perrotta Jun 19, 2015
0377301
remove from the subtables all paths not yet in DQM
perrotta Jun 19, 2015
809ddbd
Update the list for the HI paths in the 50ns menu
perrotta Jun 19, 2015
ba21967
Allow in 50nsGRun the paths from the tickets greenlighted by STEAM
perrotta Jun 22, 2015
222010c
Update also the 25ns and Fake menus
perrotta Jun 22, 2015
a80da67
further updates to the 50ns menu
perrotta Jun 23, 2015
97039d4
Fix L1 menu treatment
Martin-Grunewald Jun 25, 2015
60b961f
Fix of L1 Fix
Martin-Grunewald Jun 25, 2015
09bf1c0
Fix L1 for 50nsGRun
Martin-Grunewald Jun 25, 2015
6cadace
Fix txt files for Stream-A RIP
Martin-Grunewald Jun 25, 2015
6f19570
Migration to 746 template
Martin-Grunewald Jun 26, 2015
e544e00
Update for data taking
Martin-Grunewald Jun 27, 2015
593417a
Further 50ns+LowPU HLT updates
Martin-Grunewald Jun 30, 2015
00c35cf
Use of lowPU L1T v4
Martin-Grunewald Jun 30, 2015
dc0ec01
Final touches
Martin-Grunewald Jul 1, 2015
c43a951
Remove paths (CMSHLT-98)
Martin-Grunewald Jul 1, 2015
a951d8c
Remove paths (CMSHLT-98) also in 25ns
Martin-Grunewald Jul 1, 2015
54c59f1
CMSHLT-408
Martin-Grunewald Jul 2, 2015
07cf3d0
Further HLT updates
Martin-Grunewald Jul 3, 2015
b32b84a
Add SiStripRegionConnectivity ESProducer
Martin-Grunewald Jul 3, 2015
e07f5ef
Fake menu
Martin-Grunewald Jul 3, 2015
4ac0ae1
More HLT updates
Martin-Grunewald Jul 3, 2015
e9b47a9
Fix bloody stream event content again
Martin-Grunewald Jul 3, 2015
5cb54af
Fix LowPU
Martin-Grunewald Jul 3, 2015
ed57152
CMSHLT 464 and 465
Martin-Grunewald Jul 6, 2015
5415013
HLTAnalyzerEndpath
Martin-Grunewald Jul 7, 2015
9cedaea
Assorted fixes and restoration of 2 B2G paths
Martin-Grunewald Jul 9, 2015
43df36c
More updates
Martin-Grunewald Jul 10, 2015
5751db5
Config Fix after const_cast Fix
Martin-Grunewald Jul 10, 2015
acb9be0
Fix for IB case
Martin-Grunewald Jul 10, 2015
19545b6
More const_cast fallout
Martin-Grunewald Jul 10, 2015
4df4e14
Next frozen online is to be version v3.0
Martin-Grunewald Jul 11, 2015
fea9e9e
Merged hltUpdatesOnTopOf745plusEpsilon_75X from repository cms-tsg-storm
Martin-Grunewald Jul 13, 2015
217c641
Remove v2 menus (are not in 74X anyway)
Martin-Grunewald Jul 13, 2015
1e6cdd9
Prepare for frozen v3 menus
Martin-Grunewald Jul 13, 2015
e171a0d
Add frozen v3 menus
Martin-Grunewald Jul 13, 2015
d704dc5
v3 in cmsDriver.csh
Martin-Grunewald Jul 14, 2015
34b7ca8
Remove hardwired L1T menu (except HIon)
Martin-Grunewald Jul 14, 2015
f7b6e2c
Merged hltUpdatesOnTopOf745plusEpsilon_75X from repository cms-tsg-storm
Martin-Grunewald Jul 15, 2015
3d6c610
Backport of 10184
Martin-Grunewald Jul 15, 2015
344904a
HIon case
Martin-Grunewald Jul 15, 2015
492ea9f
Removal of hard-coded L1T menus in favor of GT overloading
Martin-Grunewald Jul 16, 2015
c9008eb
conect in toGet has become tracked!
Martin-Grunewald Jul 16, 2015
74c74f5
Set snapshotTime
Martin-Grunewald Jul 16, 2015
a49d182
Set snapshotTime
Martin-Grunewald Jul 16, 2015
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 Configuration/AlCa/python/GlobalTag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def GlobalTag(essource = None, globaltag = None, conditions = None):
payload.label = cms.untracked.string( label )
payload.tag = cms.string( tag )
if connection:
payload.connect = cms.untracked.string( connection )
payload.connect = cms.string( connection )
essource.toGet.append( payload )

return essource
2 changes: 1 addition & 1 deletion Configuration/AlCa/python/GlobalTag_condDBv1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def GlobalTag(essource = None, globaltag = None, conditions = None):
payload.label = cms.untracked.string( label )
payload.tag = cms.string( tag )
if connection:
payload.connect = cms.untracked.string( connection )
payload.connect = cms.string( connection )
essource.toGet.append( payload )

return essource
89 changes: 53 additions & 36 deletions Configuration/HLT/python/autoCondHLT.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,61 @@
# https://cms-conddb.cern.ch/browser/#search

l1Menus= {
'Fake' : 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc',
'FULL' : 'L1Menu_Collisions2015_25nsStage1_v3',
'GRun' : 'L1Menu_Collisions2015_25nsStage1_v3',
'25ns14e33_v1' : 'L1Menu_Collisions2015_25ns_v2_L1T_Scales_20141121_Imp0_0x1030',
'25ns14e33_v3' : 'L1Menu_Collisions2015_25nsStage1_v3',
'HIon' : 'L1Menu_CollisionsHeavyIons2011_v0_nobsc_notau_centrality_q2_singletrack.v1',
'PIon' : 'L1Menu_Collisions2015_25nsStage1_v3',
'50nsGRun' : 'L1Menu_Collisions2015_50nsGct_v4',
'50ns_5e33_v1' : 'L1Menu_Collisions2015_50nsGct_v1_L1T_Scales_20141121_Imp0_0x1030',
'50ns_5e33_v3' : 'L1Menu_Collisions2015_50nsGct_v4',
'LowPU' : 'L1Menu_Collisions2015_lowPU_v4',
}

for key,val in l1Menus.iteritems():
l1Menus[key] = (val+',L1GtTriggerMenuRcd,frontier://FrontierProd/CMS_CONDITIONS',)

hltGTs = {

# 'symbolic GT' : ('base GT',[('payload1',payload2')])

'run1_mc_Fake' : ('run1_mc',),
'run1_hlt_Fake' : ('run1_hlt',),
'run1_data_Fake' : ('run1_data',),

'run2_mc_FULL' : ('run2_mc',),
'run2_mc_GRun' : ('run2_mc',),
'run2_mc_25ns14e33_v1' : ('run2_mc',),
'run2_mc_25ns14e33_v2' : ('run2_mc',),
'run2_mc_HIon' : ('run2_mc_hi',),
'run2_mc_PIon' : ('run2_mc',),
'run2_mc_50nsGRun' : ('run2_mc_50ns',),
'run2_mc_50ns_5e33_v1' : ('run2_mc_50ns',),
'run2_mc_50ns_5e33_v2' : ('run2_mc_50ns',),
'run2_mc_LowPU' : ('run2_mc_50ns',),

'run2_hlt_FULL' : ('run2_hlt',),
'run2_hlt_GRun' : ('run2_hlt',),
'run2_hlt_25ns14e33_v1' : ('run2_hlt',),
'run2_hlt_25ns14e33_v2' : ('run2_hlt',),
'run2_hlt_HIon' : ('run2_hlt',),
'run2_hlt_PIon' : ('run2_hlt',),
'run2_hlt_50nsGRun' : ('run2_hlt',),
'run2_hlt_50ns_5e33_v1' : ('run2_hlt',),
'run2_hlt_50ns_5e33_v2' : ('run2_hlt',),
'run2_hlt_LowPU' : ('run2_hlt',),

'run2_data_FULL' : ('run2_data',),
'run2_data_GRun' : ('run2_data',),
'run2_data_25ns14e33_v1' : ('run2_data',),
'run2_data_25ns14e33_v2' : ('run2_data',),
'run2_data_HIon' : ('run2_data',),
'run2_data_PIon' : ('run2_data',),
'run2_data_50nsGRun' : ('run2_data',),
'run2_data_50ns_5e33_v1' : ('run2_data',),
'run2_data_50ns_5e33_v2' : ('run2_data',),
'run2_data_LowPU' : ('run2_data',),
'run1_mc_Fake' : ('run1_mc' ,l1Menus['Fake']),
'run2_mc_FULL' : ('run2_mc' ,l1Menus['FULL']),
'run2_mc_GRun' : ('run2_mc' ,l1Menus['GRun']),
'run2_mc_25ns14e33_v1' : ('run2_mc' ,l1Menus['25ns14e33_v1']),
'run2_mc_25ns14e33_v3' : ('run2_mc' ,l1Menus['25ns14e33_v3']),
'run2_mc_HIon' : ('run2_mc_hi' ,l1Menus['HIon']),
'run2_mc_PIon' : ('run2_mc' ,l1Menus['PIon']),
'run2_mc_50nsGRun' : ('run2_mc_50ns' ,l1Menus['50nsGRun']),
'run2_mc_50ns_5e33_v1' : ('run2_mc_50ns' ,l1Menus['50ns_5e33_v1']),
'run2_mc_50ns_5e33_v3' : ('run2_mc_50ns' ,l1Menus['50ns_5e33_v3']),
'run2_mc_LowPU' : ('run2_mc_50ns' ,l1Menus['LowPU']),

'run1_hlt_Fake' : ('run1_hlt' ,l1Menus['Fake']),
'run2_hlt_FULL' : ('run2_hlt' ,l1Menus['FULL']),
'run2_hlt_GRun' : ('run2_hlt' ,l1Menus['GRun']),
'run2_hlt_25ns14e33_v1' : ('run2_hlt' ,l1Menus['25ns14e33_v1']),
'run2_hlt_25ns14e33_v3' : ('run2_hlt' ,l1Menus['25ns14e33_v3']),
'run2_hlt_HIon' : ('run2_hlt' ,l1Menus['HIon']),
'run2_hlt_PIon' : ('run2_hlt' ,l1Menus['PIon']),
'run2_hlt_50nsGRun' : ('run2_hlt' ,l1Menus['50nsGRun']),
'run2_hlt_50ns_5e33_v1' : ('run2_hlt' ,l1Menus['50ns_5e33_v1']),
'run2_hlt_50ns_5e33_v3' : ('run2_hlt' ,l1Menus['50ns_5e33_v3']),
'run2_hlt_LowPU' : ('run2_hlt' ,l1Menus['LowPU']),

'run1_data_Fake' : ('run1_data' ,l1Menus['Fake']),
'run2_data_FULL' : ('run2_data' ,l1Menus['FULL']),
'run2_data_GRun' : ('run2_data' ,l1Menus['GRun']),
'run2_data_25ns14e33_v1' : ('run2_data' ,l1Menus['25ns14e33_v1']),
'run2_data_25ns14e33_v3' : ('run2_data' ,l1Menus['25ns14e33_v3']),
'run2_data_HIon' : ('run2_data' ,l1Menus['HIon']),
'run2_data_PIon' : ('run2_data' ,l1Menus['PIon']),
'run2_data_50nsGRun' : ('run2_data' ,l1Menus['50nsGRun']),
'run2_data_50ns_5e33_v1' : ('run2_data' ,l1Menus['50ns_5e33_v1']),
'run2_data_50ns_5e33_v3' : ('run2_data' ,l1Menus['50ns_5e33_v3']),
'run2_data_LowPU' : ('run2_data' ,l1Menus['LowPU']),

}

Expand Down
5 changes: 4 additions & 1 deletion HLTrigger/Configuration/python/CustomConfigs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ def Base(process):
# process.GlobalTag.connect = 'frontier://FrontierProd/CMS_CONDITIONS'
# process.GlobalTag.pfnPrefix = cms.untracked.string('frontier://Frontie#rProd/')
#
process.GlobalTag.snapshotTime = cms.string("9999-12-31 23:59:59.000")

process=ProcessName(process)

return(process)
Expand Down Expand Up @@ -58,9 +60,10 @@ def L1THLT(process):

if not ('HLTAnalyzerEndpath' in process.__dict__) :
from HLTrigger.Configuration.HLT_FULL_cff import fragment
process.hltGtDigis = fragment.hltGtDigis
process.hltL1GtTrigReport = fragment.hltL1GtTrigReport
process.hltTrigReport = fragment.hltTrigReport
process.HLTAnalyzerEndpath = cms.EndPath(process.hltL1GtTrigReport + process.hltTrigReport)
process.HLTAnalyzerEndpath = cms.EndPath(process.hltGtDigis + process.hltL1GtTrigReport + process.hltTrigReport)
process.schedule.append(process.HLTAnalyzerEndpath)

process=Base(process)
Expand Down
10 changes: 5 additions & 5 deletions HLTrigger/Configuration/python/HLT_25ns14e33_v1_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# /frozen/2015/25ns14e33/v1.2/HLT/V2 (CMSSW_7_4_0)
# /frozen/2015/25ns14e33/v1.2/HLT/V3 (CMSSW_7_4_0)

import FWCore.ParameterSet.Config as cms

fragment = cms.ProcessFragment( "HLT" )

fragment.HLTConfigVersion = cms.PSet(
tableName = cms.string('/frozen/2015/25ns14e33/v1.2/HLT/V2')
tableName = cms.string('/frozen/2015/25ns14e33/v1.2/HLT/V3')
)

fragment.HLTIter4PSetTrajectoryFilterIT = cms.PSet(
Expand Down Expand Up @@ -18188,7 +18188,7 @@
)
fragment.hltEle45CaloIdVTGsfTrkIdTDiCentralPFJet50EleCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter",
saveTags = cms.bool( True ),
originalTag = cms.InputTag( "hltPFJetsCorrectedMatchedToL1" ),
originalTag = cms.InputTag( "hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet" ),
inputTag = cms.InputTag( "hltEle45CaloIdVTGsfTrkIdTCleanAK4PFJet" ),
MinJetPt = cms.double( 50.0 ),
triggerType = cms.int32( 0 ),
Expand Down Expand Up @@ -25425,7 +25425,7 @@
)
fragment.hltMu40eta2p1DiCentralPFJet50MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter",
saveTags = cms.bool( True ),
originalTag = cms.InputTag( "hltPFJetsCorrectedMatchedToL1" ),
originalTag = cms.InputTag( "hltMu40eta2p1CleanAK4PFJet" ),
inputTag = cms.InputTag( "hltMu40eta2p1CleanAK4PFJet" ),
MinJetPt = cms.double( 50.0 ),
triggerType = cms.int32( 0 ),
Expand All @@ -25434,7 +25434,7 @@
)
fragment.hltMu40eta2p1CentralPFJet200MuCleaned = cms.EDFilter( "HLTPFJetCollectionsFilter",
saveTags = cms.bool( True ),
originalTag = cms.InputTag( "hltPFJetsCorrectedMatchedToL1" ),
originalTag = cms.InputTag( "hltMu40eta2p1CleanAK4PFJet" ),
inputTag = cms.InputTag( "hltMu40eta2p1CleanAK4PFJet" ),
MinJetPt = cms.double( 200.0 ),
triggerType = cms.int32( 0 ),
Expand Down
Loading