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

Remove l1menu customs plus l1bugfix 74 x #10506

Merged
merged 69 commits into from Aug 1, 2015
Merged

Remove l1menu customs plus l1bugfix 74 x #10506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
6ca7667
Update lists
perrotta Jun 16, 2015
5a7aa87
Subtables
perrotta Jun 17, 2015
d90242a
further updates to the menus
perrotta Jun 18, 2015
66cd3e3
50ns menu updates
perrotta Jun 19, 2015
2969312
50ns menu updates
perrotta Jun 19, 2015
79666eb
L1Menu_Collisions2015_50ns_v3 needed by the latest paths integrated i…
perrotta Jun 19, 2015
176b7f0
remove from the subtables all paths not yet in DQM
perrotta Jun 19, 2015
818a0d0
Update the list for the HI paths in the 50ns menu
perrotta Jun 19, 2015
5fea93b
Allow in 50nsGRun the paths from the tickets greenlighted by STEAM
perrotta Jun 22, 2015
af87cba
Update also the 25ns menu
perrotta Jun 22, 2015
86bd5bf
Update also the Fake menu
perrotta Jun 22, 2015
6691578
Do not regenerate frozen menus in 74X
perrotta Jun 23, 2015
e5d737a
further updates to the 50ns menu
perrotta Jun 23, 2015
1a3b233
Revert "L1Menu_Collisions2015_50ns_v3 needed by the latest paths inte…
perrotta Jun 23, 2015
8d7dd88
Revert "Revert "L1Menu_Collisions2015_50ns_v3 needed by the latest pa…
perrotta Jun 23, 2015
9e5bfbf
Split previous stream A in three streams in the 50ns master and deriv…
perrotta Jun 24, 2015
bffec7f
Fix L1 menu treatment
Martin-Grunewald Jun 25, 2015
472b1ec
Fix of L1 Fix
Martin-Grunewald Jun 25, 2015
bc52959
Fix L1 for 50nsGRun
Martin-Grunewald Jun 25, 2015
6b87d22
Migration to 746 template
Martin-Grunewald Jun 26, 2015
0447666
Update for data taking
Martin-Grunewald Jun 27, 2015
52efdca
Further 50ns+LowPU HLT updates
Martin-Grunewald Jun 30, 2015
ce228da
Use of lowPU L1T v4
Martin-Grunewald Jun 30, 2015
814db7f
Final touches
Martin-Grunewald Jul 1, 2015
a10b956
Remove paths (CMSHLT-98)
Martin-Grunewald Jul 1, 2015
8f7e3f3
Remove paths (CMSHLT-98) also in 25ns
Martin-Grunewald Jul 1, 2015
e5c7f34
CMSHLT-408
Martin-Grunewald Jul 2, 2015
3eaa018
Further HLT updates
Martin-Grunewald Jul 3, 2015
f6b304d
Add SiStripRegionConnectivity ESProducer
Martin-Grunewald Jul 3, 2015
549f8d3
Fake menu
Martin-Grunewald Jul 3, 2015
cc9522e
More HLT updates
Martin-Grunewald Jul 3, 2015
1d63611
Fix bloody stream event content again
Martin-Grunewald Jul 3, 2015
6ce7a75
Fix LowPU
Martin-Grunewald Jul 3, 2015
3e4ceab
CMSHLT 464 and 465
Martin-Grunewald Jul 6, 2015
9e1205e
HLTAnalyzerEndpath
Martin-Grunewald Jul 7, 2015
6889e11
Assorted fixes and restoration of 2 B2G paths
Martin-Grunewald Jul 9, 2015
8b96832
More updates
Martin-Grunewald Jul 10, 2015
d9a924c
Config Fix after const_cast Fix
Martin-Grunewald Jul 10, 2015
d48474d
Fix for IB case
Martin-Grunewald Jul 10, 2015
efe7a02
More const_cast fallout
Martin-Grunewald Jul 10, 2015
06b0d0f
Next frozen online is to be version v3.0
Martin-Grunewald Jul 11, 2015
c5eaaaa
Merged hltUpdatesOnTopOf745plusEpsilon_74X from repository cms-tsg-storm
Martin-Grunewald Jul 13, 2015
fec426c
Prepare for frozen v3 menus
Martin-Grunewald Jul 13, 2015
8762e6d
Add frozen v3 menus
Martin-Grunewald Jul 13, 2015
234ffe0
v3 in cmsDriver.csh
Martin-Grunewald Jul 14, 2015
ee036f1
Remove hardwired L1T menu (except HIon)
Martin-Grunewald Jul 14, 2015
320992e
Remove hardwired L1T menu (except HIon)
Martin-Grunewald Jul 14, 2015
06c6579
Merged hltUpdatesOnTopOf745plusEpsilon_74X from repository cms-tsg-storm
Martin-Grunewald Jul 15, 2015
3e79227
Backport of 10184
Martin-Grunewald Jul 15, 2015
86c1498
HIon case
Martin-Grunewald Jul 15, 2015
bbdedec
Removal of hard-coded L1T menus in favor of GT overloading
Martin-Grunewald Jul 16, 2015
a8567e6
Set snapshotTime
Martin-Grunewald Jul 16, 2015
ccf2333
Set snapshotTime
Martin-Grunewald Jul 16, 2015
78bf856
Merged hltUpdatesOnTopOf745plusEpsilon_74X from repository cms-tsg-storm
perrotta Jul 16, 2015
9a4b2c4
Update up to 50ns frozen menu v3.4
perrotta Jul 17, 2015
5170c40
Merged hltUpdatesOnTopOf745plusEpsilon_74X from repository cms-tsg-storm
Martin-Grunewald Jul 17, 2015
4cbaf7d
Fix scripts and update frozen 50ns dump
Martin-Grunewald Jul 17, 2015
6e11ab6
Merged hltUpdatesOnTopOf745plusEpsilon_74X from repository cms-tsg-storm
Martin-Grunewald Jul 17, 2015
50a88a6
Fix script
Martin-Grunewald Jul 17, 2015
5f57309
25ns changes
Martin-Grunewald Jul 20, 2015
54ae631
v2 support
Martin-Grunewald Jul 21, 2015
46a3fd2
v2 for 50ns
Martin-Grunewald Jul 21, 2015
a776519
v2 for 50ns
Martin-Grunewald Jul 21, 2015
40c6959
Merged hltUpdatesOnTopOf745plusEpsilon_74X from repository cms-tsg-storm
perrotta Jul 24, 2015
973b02a
Update the 25ns menu up to master /dev/CMSSW_7_4_0/HLT/V285
perrotta Jul 24, 2015
e638478
Merged refs/pull/9878/head from repository cms-sw
perrotta Jul 28, 2015
c32115a
Dump legacy 50ns frozen menu in the releases
perrotta Jul 28, 2015
43677ce
Merged refs/pull/10413/head from repository cms-sw
mulhearn Jul 31, 2015
b67b18e
fix bug causing configs to call stage1 for all postLS1 workflows
mulhearn Jul 31, 2015
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
97 changes: 61 additions & 36 deletions Configuration/HLT/python/autoCondHLT.py
View file
Open in desktop
@@ -1,44 +1,69 @@
# 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_v2' : 'L1Menu_Collisions2015_25nsStage1_v3',
'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_v2' : 'L1Menu_Collisions2015_50nsGct_v4',
'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_v2' : ('run2_mc' ,l1Menus['25ns14e33_v2']),
'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_v2' : ('run2_mc_50ns' ,l1Menus['50ns_5e33_v2']),
'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_v2' : ('run2_hlt' ,l1Menus['25ns14e33_v2']),
'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_v2' : ('run2_hlt' ,l1Menus['50ns_5e33_v2']),
'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_v2' : ('run2_data' ,l1Menus['25ns14e33_v2']),
'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_v2' : ('run2_data' ,l1Menus['50ns_5e33_v2']),
'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
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")
Copy link
Contributor

Choose a reason for hiding this comment

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

There is no hope to get a gt with the right snapshot time?

Copy link
Contributor

Choose a reason for hiding this comment

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

No: this is for the updated L1 menus versions - we can't wait for the GT PRs,
and some L1T menus will never make a GT (eg, the special LowPU L1T menus).

Copy link
Contributor

Choose a reason for hiding this comment

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

Do I understand it correctly that these customs never make it to relval
production workflows? Otherwise we can get conditions changing during
relval production.
On Aug 5, 2015 4:28 AM, "Martin Grunewald" notifications@github.com wrote:

In HLTrigger/Configuration/python/CustomConfigs.py
#10506 (comment):

@@ -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")

No: this is for the updated L1 menus versions - we can't wait for the GT
PRs,
and some L1T menus will never make a GT (eg, the special LowPU L1T menus).

—
Reply to this email directly or view it on GitHub
https://github.com/cms-sw/cmssw/pull/10506/files#r36283767.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is not used in production workflows, as it would need to be explcitely called as customisation function.


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
@@ -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