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

move to 2016 era and 2016 hlt where it is working in relvals #13919

Merged
merged 68 commits into from Apr 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
9c60d20
Rebased to CMSSW_8_0_X_2016-03-01-2300
Martin-Grunewald Mar 2, 2016
5d9e969
EGAmma and Muon issues
Martin-Grunewald Mar 2, 2016
ad5b3f7
More customisation
Martin-Grunewald Mar 2, 2016
6014a7f
More customisation
Martin-Grunewald Mar 2, 2016
4d6df22
Revert HLTRecHitInAllL1RegionsProducer.h
Martin-Grunewald Mar 2, 2016
18cdf88
EGamma work
Martin-Grunewald Mar 2, 2016
43fdd6d
Muon and L1T work
Martin-Grunewald Mar 4, 2016
a251b78
L1T xml files from CondDB
Martin-Grunewald Mar 4, 2016
4fe8040
Fix L1T menu treatment in FastSim
Martin-Grunewald Mar 4, 2016
434a7f5
Fix L1T menu treatment in FastSim
Martin-Grunewald Mar 4, 2016
1e968bd
Fix L1T menu treatment again
Martin-Grunewald Mar 5, 2016
601dbbc
New Dumps
Martin-Grunewald Mar 5, 2016
d48fd38
Fix HIon case
Martin-Grunewald Mar 5, 2016
a863bb7
Hcal isolated pixel track part
Martin-Grunewald Mar 6, 2016
c7b48a4
Migration to 801
Martin-Grunewald Mar 6, 2016
70d4256
JetMET and CaloTowerTau migration
Martin-Grunewald Mar 7, 2016
6273d5a
Resolve merge conflict in 81X
Martin-Grunewald Mar 11, 2016
ce92aac
Merged HLTwithL1TStage2bis81X from repository cms-tsg-storm
Martin-Grunewald Mar 11, 2016
0c8a3dd
Merged HLTwithL1TStage2bis81X from repository cms-tsg-storm
Martin-Grunewald Mar 11, 2016
ff271d6
Integration work
Martin-Grunewald Mar 12, 2016
5b7335c
Fix Skims_PDWG_cff
Martin-Grunewald Mar 12, 2016
e514045
Reduce Printout
Martin-Grunewald Mar 12, 2016
ebc2b95
Merged HLTwithL1TStage2bis81X from repository cms-tsg-storm
Martin-Grunewald Mar 13, 2016
869c42d
Fix extra quotation mark
Martin-Grunewald Mar 13, 2016
ba3cdd5
Update test cfg file
Martin-Grunewald Mar 15, 2016
338aceb
Migration in ConfDB
Martin-Grunewald Mar 16, 2016
e44f613
Shortcircuit HLTLevel1Activity
Martin-Grunewald Mar 16, 2016
049e03a
Shortcircuit HLTLevel1Activity
Martin-Grunewald Mar 16, 2016
e4f7fe4
Replace tech triggers by L1_ZeroBias
Martin-Grunewald Mar 16, 2016
1eb0459
Final hltL1extraParticles removal
Martin-Grunewald Mar 16, 2016
00839e2
PIon / saveTags default in HLTFilter
Martin-Grunewald Mar 18, 2016
872a57b
Revert temporary GT hack
Martin-Grunewald Mar 18, 2016
bb74778
Update EventContent for stage-2
Martin-Grunewald Mar 18, 2016
96f0172
Fix TriggerObjectMap filling with a long L1T menu
Martin-Grunewald Mar 19, 2016
5205cbe
L1T menu in GT
Martin-Grunewald Mar 19, 2016
5e065a8
FastSim addOn tests
Martin-Grunewald Mar 19, 2016
d5007de
FastSim addOn tests
Martin-Grunewald Mar 19, 2016
7549d2e
Fix FastSim
Martin-Grunewald Mar 19, 2016
3162a8a
Fix phase1_2017_design GT
Martin-Grunewald Mar 19, 2016
8cb9cec
Fix typo
Martin-Grunewald Mar 19, 2016
c58e45e
Merged refs/pull/13701/head from repository cms-sw
Martin-Grunewald Mar 22, 2016
d7b51d7
saveTags=true
Martin-Grunewald Mar 22, 2016
b9c66e1
Script et al. work
Martin-Grunewald Mar 22, 2016
59bda24
Further script work
Martin-Grunewald Mar 23, 2016
c48133f
Change Seed Conditions for new L1T Menu
Martin-Grunewald Mar 23, 2016
a9c0ad2
Update labels of HLTL1TSeed instances to reflect seeds used
Martin-Grunewald Mar 23, 2016
b2f2b73
Take L1Menu_Collisions2016_dev_v3_xml from CondDB
Martin-Grunewald Mar 23, 2016
aa67d50
L1 option work
Martin-Grunewald Mar 23, 2016
362b0f9
Merged HLTL1TMenu81X from repository cms-tsg-storm
perrotta Mar 24, 2016
1494ce0
Several updates to the HLT menu, up to /dev/CMSSW_8_0_0/HLT/V7
perrotta Mar 24, 2016
9d2d861
Merged HLTL1TMenu81X from repository cms-tsg-storm
Martin-Grunewald Mar 24, 2016
9d6ffa8
Fix confdb.py
Martin-Grunewald Mar 24, 2016
fce1f3c
Move to L1T v4 menu
Martin-Grunewald Mar 24, 2016
6f19260
Revert to v3 of L1T menu
Martin-Grunewald Mar 25, 2016
de85522
Update HLT to L1T menu v4
Martin-Grunewald Mar 29, 2016
798d2c8
Merged HLTL1TMenu81X from repository cms-tsg-storm
perrotta Mar 29, 2016
fa1160c
Introduce HBHE filter in the 2016 HLT menu
perrotta Mar 29, 2016
c5991cf
Merged HLTL1TMenu81X from repository cms-tsg-storm
Martin-Grunewald Mar 30, 2016
621cc5c
Fix HLT config
Martin-Grunewald Mar 30, 2016
c5518c5
Merged HLTL1TMenu81X from repository cms-tsg-storm
perrotta Mar 30, 2016
af25c57
Further integrations
perrotta Mar 30, 2016
c708541
Merged HLTL1TMenu81X from repository cms-tsg-storm
Martin-Grunewald Mar 30, 2016
feb31a9
Temporary fix for run2_data_GRun/PIon GTs
Martin-Grunewald Mar 30, 2016
18d7e92
Updating L1 Menu and HLT JECs
mmusich Apr 2, 2016
b111d95
Merged refs/pull/13892/head from repository cms-sw
davidlange6 Apr 2, 2016
3c4fed0
Merged refs/pull/13863/head from repository cms-sw
davidlange6 Apr 2, 2016
bf35212
move to 2016 era and 2016 hlt where it is working
davidlange6 Apr 4, 2016
9e7fc6e
fix typo
davidlange6 Apr 4, 2016
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
24 changes: 12 additions & 12 deletions Configuration/AlCa/python/autoCond.py
Expand Up @@ -10,33 +10,33 @@
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pa' : '80X_mcRun1_pA_v4',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : '80X_mcRun2_design_v9',
'run2_design' : '80X_mcRun2_design_v10',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : '80X_mcRun2_startup_v9',
'run2_mc_50ns' : '80X_mcRun2_startup_v10',
#GlobalTag for MC production with optimistic alignment and calibrations for Run2
'run2_mc' : '80X_mcRun2_asymptotic_v9',
'run2_mc' : '80X_mcRun2_asymptotic_v10',
# GlobalTag for MC production (cosmics) with starup-like alignment and calibrations for Run2, Strip tracker in peak mode
'run2_mc_cosmics' : '80X_mcRun2cosmics_startup_peak_v8',
'run2_mc_cosmics' : '80X_mcRun2cosmics_startup_peak_v9',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : '80X_mcRun2_HeavyIon_v8',
# GlobalTag for Run1 data reprocessing
'run1_data' : '80X_dataRun2_v9',
'run1_data' : '80X_dataRun2_v10',
# GlobalTag for Run2 data reprocessing
'run2_data' : '80X_dataRun2_v9',
'run2_data' : '80X_dataRun2_v10',
# GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
'run2_data_relval' : '80X_dataRun2_relval_v4',
'run2_data_relval' : '80X_dataRun2_relval_v5',
# GlobalTag for Run1 HLT: it points to the online GT
'run1_hlt' : '80X_dataRun2_HLT_frozen_v8',
'run1_hlt' : '80X_dataRun2_HLT_frozen_v9',
# GlobalTag for Run2 HLT: it points to the online GT
'run2_hlt' : '80X_dataRun2_HLT_frozen_v8',
'run2_hlt' : '80X_dataRun2_HLT_frozen_v9',
# GlobalTag for Run2 HLT RelVals: customizations to run with fixed L1 Menu
'run2_hlt_relval' : '80X_dataRun2_HLT_relval_v4',
'run2_hlt_relval' : '80X_dataRun2_HLT_relval_v5',
# GlobalTag for Run2 HLT for HI: it points to the online GT
'run2_hlt_hi' : '80X_dataRun2_HLTHI_frozen_v7',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
'phase1_2017_design' : '80X_upgrade2017_design_v8',
'phase1_2017_design' : '80X_upgrade2017_design_v9',
# GlobalTag for MC production with realistic conditions for for Phase1 2017 detector
'phase1_2017_realistic': '80X_upgrade2017_realistic_v0',
'phase1_2017_realistic': '80X_upgrade2017_realistic_v1',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
'phase1_2019_design' : 'DES19_70_V2', # placeholder (GT not meant for standard RelVal)
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase2
Expand Down
41 changes: 34 additions & 7 deletions Configuration/HLT/python/autoCondHLT.py
@@ -1,21 +1,28 @@
# https://cms-conddb.cern.ch/browser/#search

#default value for all L1T menus
# default value for all L1T menus
connectionString = "frontier://FrontierProd/CMS_CONDITIONS"

# L1T legacy (Fake) / stage-1 (Fake1)
l1MenuRecord = "L1GtTriggerMenuRcd"
l1MenuLabel = ""

# L1T stage-2
l1tMenuRecord = "L1TUtmTriggerMenuRcd"
l1tMenuLabel = ""

#The snapshot time has been set as starting point as the one of PR 12095.
#Next time you change the customisations, change also the snapshot time in the affected tuple,
#and leave unchanged the snapshot times for the other tuples.

l1Menus= {
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord, connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord, connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord, connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_mc' , l1MenuRecord, connectionString, l1MenuLabel, "2015-11-26 20:00:00.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord, connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'PRef' : ( ','.join( [ 'L1Menu_Collisions2015_5TeV_pp_reference_v5_mc', l1MenuRecord, connectionString, l1MenuLabel, "2015-11-25 20:00:00.000"] ), ),
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake1': ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2016_dev_v4_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-24 10:00:00.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2016_dev_v4_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-24 10:00:00.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_uGT_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_Collisions2016_dev_v4_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-24 10:00:00.000"] ), ),
'PRef' : ( ','.join( [ 'L1Menu_Collisions2015_5TeV_pp_reference_v5_uGT_v2_mc_xml',l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
}

hltGTs = {
Expand All @@ -24,6 +31,7 @@

'run1_mc_Fake' : ('run1_mc' ,l1Menus['Fake']),
'run2_mc_Fake' : ('run2_mc' ,l1Menus['Fake']),
'run2_mc_Fake1' : ('run2_mc' ,l1Menus['Fake1']),
'run2_mc_FULL' : ('run2_mc' ,l1Menus['FULL']),
'run2_mc_GRun' : ('run2_mc' ,l1Menus['GRun']),
'run2_mc_HIon' : ('run2_mc_hi' ,l1Menus['HIon']),
Expand All @@ -32,6 +40,7 @@

'run1_hlt_Fake' : ('run1_hlt' ,l1Menus['Fake']),
'run2_hlt_Fake' : ('run2_hlt' ,l1Menus['Fake']),
'run2_hlt_Fake1' : ('run2_hlt' ,l1Menus['Fake1']),
'run2_hlt_FULL' : ('run2_hlt' ,l1Menus['FULL']),
'run2_hlt_GRun' : ('run2_hlt' ,l1Menus['GRun']),
'run2_hlt_HIon' : ('run2_hlt_hi' ,l1Menus['HIon']),
Expand All @@ -40,6 +49,7 @@

'run1_data_Fake' : ('run1_data' ,l1Menus['Fake']),
'run2_data_Fake' : ('run2_data' ,l1Menus['Fake']),
'run2_data_Fake1' : ('run2_data' ,l1Menus['Fake1']),
'run2_data_FULL' : ('run2_data' ,l1Menus['FULL']),
'run2_data_GRun' : ('run2_data' ,l1Menus['GRun']),
'run2_data_HIon' : ('run2_data' ,l1Menus['HIon']),
Expand All @@ -54,4 +64,21 @@ def autoCondHLT(autoCond):
autoCond[key] = ( autoCond[val[0]] )
else:
autoCond[key] = ( autoCond[val[0]],) + val[1]

payLoad = ('pfscecal_EBCorrection_online_v0,GBRDWrapperRcd,frontier://FrontierProd/CMS_CONDITIONS,pfscecal_EBCorrection_online,2016-02-17 21:00:00.000',)
autoCond['run2_data_GRun'] = autoCond['run2_data_GRun'] + payLoad
autoCond['run2_data_PIon'] = autoCond['run2_data_PIon'] + payLoad

payLoad = ('pfscecal_EECorrection_online_v0,GBRDWrapperRcd,frontier://FrontierProd/CMS_CONDITIONS,pfscecal_EECorrection_online,2016-02-17 21:00:00.000',)
autoCond['run2_data_GRun'] = autoCond['run2_data_GRun'] + payLoad
autoCond['run2_data_PIon'] = autoCond['run2_data_PIon'] + payLoad

payLoad = ('pfscecal_EBUncertainty_online_v0,GBRDWrapperRcd,frontier://FrontierProd/CMS_CONDITIONS,pfscecal_EBUncertainty_online,2016-02-17 21:00:00.000',)
autoCond['run2_data_GRun'] = autoCond['run2_data_GRun'] + payLoad
autoCond['run2_data_PIon'] = autoCond['run2_data_PIon'] + payLoad

payLoad = ('pfscecal_EEUncertainty_online_v0,GBRDWrapperRcd,frontier://FrontierProd/CMS_CONDITIONS,pfscecal_EEUncertainty_online,2016-02-17 21:00:00.000',)
autoCond['run2_data_GRun'] = autoCond['run2_data_GRun'] + payLoad
autoCond['run2_data_PIon'] = autoCond['run2_data_PIon'] + payLoad

return autoCond
14 changes: 4 additions & 10 deletions Configuration/HLT/python/autoHLT.py
Expand Up @@ -2,16 +2,10 @@
# cmsDiver.py hlt -s HLT:@relval

autoHLT = {
'frozen' : 'GRun',
'relval' : 'GRun',
'frozenHIon' : 'HIon',
'relvalHIon' : 'HIon',
'frozenPRef' : 'PRef',
'relvalPRef' : 'PRef',
'frozen25ns' : 'GRun',
'relval25ns' : 'GRun',
'frozen50ns' : 'Fake',
'relval50ns' : 'Fake',
'fake' : 'Fake',
'fake1' : 'Fake1',
'relval50ns' : 'Fake',
'relval25ns' : 'Fake1',
'relval2016' : 'GRun',
'test' : 'GRun',
}
20 changes: 10 additions & 10 deletions Configuration/PyReleaseValidation/python/relval_steps.py
Expand Up @@ -18,7 +18,7 @@
'--beamspot' : 'Realistic50ns13TeVCollision',
'--datatier' : 'GEN-SIM',
'--eventcontent': 'FEVTDEBUG',
'--era' : 'Run2_25ns'
'--era' : 'Run2_2016'
}

steps = Steps()
Expand Down Expand Up @@ -845,17 +845,17 @@ def identityFS(wf):
'--conditions' : 'auto:run1_mc',
}
#for 2015
step2Upg2015Defaults = {'-s' :'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval25ns',
step2Upg2015Defaults = {'-s' :'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2016',
'--conditions' :'auto:run2_mc',
'--datatier' :'GEN-SIM-DIGI-RAW-HLTDEBUG',
'--eventcontent':'FEVTDEBUGHLT',
'--era' :'Run2_25ns',
'--era' :'Run2_2016',
'-n' :'10',
}
step2Upg2015Defaults50ns = merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval50ns','--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step2Upg2015Defaults])

steps['DIGIUP15']=merge([step2Upg2015Defaults])
steps['DIGIUP15PROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval25ns','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Upg2015Defaults])
steps['DIGIUP15PROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval2016','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Upg2015Defaults])
steps['DIGIUP15_PU25']=merge([PU25,step2Upg2015Defaults])
steps['DIGIUP15_PU50']=merge([PU50,step2Upg2015Defaults50ns])

Expand Down Expand Up @@ -904,7 +904,7 @@ def identityFS(wf):

digiPremixUp2015Defaults25ns = {
'--conditions' : 'auto:run2_mc',
'-s' : 'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval25ns',
'-s' : 'DIGIPREMIX_S2:pdigi_valid,DATAMIX,L1,DIGI2RAW,HLT:@relval2016',
'--pileup_input' : 'das:/RelValPREMIXUP15_PU25/%s/GEN-SIM-DIGI-RAW'%baseDataSetRelease[5],
'--eventcontent' : 'FEVTDEBUGHLT',
'--datatier' : 'GEN-SIM-DIGI-RAW-HLTDEBUG',
Expand All @@ -918,7 +918,7 @@ def identityFS(wf):
digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU25']=merge([digiPremixUp2015Defaults25ns])
steps['DIGIPRMXUP15_PU50']=merge([digiPremixUp2015Defaults50ns])
premixProd25ns = {'-s' : 'DIGIPREMIX_S2,DATAMIX,L1,DIGI2RAW,HLT:@relval25ns',
premixProd25ns = {'-s' : 'DIGIPREMIX_S2,DATAMIX,L1,DIGI2RAW,HLT:@relval2016',
'--eventcontent' : 'PREMIXRAW',
'--datatier' : 'PREMIXRAW'}
premixProd50ns = merge([{'-s':'DIGIPREMIX_S2,DATAMIX,L1,DIGI2RAW,HLT:@relval50ns'},premixProd25ns])
Expand Down Expand Up @@ -1053,7 +1053,7 @@ def identityFS(wf):
'-n':'10',
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
'--era' : 'Run2_25ns'
'--era' : 'Run2_2016'
}

step3Up2015Defaults50ns = merge([{'-s':'RAW2DIGI,L1Reco,RECO,EI,PAT,VALIDATION:@standardValidation+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM','--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step3Up2015Defaults])
Expand Down Expand Up @@ -1191,7 +1191,7 @@ def identityFS(wf):
'-s' : 'ALCA:TkAlMuonIsolated+TkAlMinBias+MuAlOverlaps+EcalESAlign',
'-n' : 1000,
'--conditions' : 'auto:run2_mc',
'--era' : 'Run2_25ns',
'--era' : 'Run2_2016',
'--datatier' : 'ALCARECO',
'--eventcontent': 'ALCARECO',
}
Expand Down Expand Up @@ -1250,7 +1250,7 @@ def identityFS(wf):
'--harvesting':'AtJobEnd',
'--conditions':'auto:run2_mc_FULL',
'--mc':'',
'--era' :'Run2_25ns',
'--era' :'Run2_2016',
'--filetype':'DQM',
'--filein':'file:step1_inDQM.root'
}
Expand Down Expand Up @@ -1340,7 +1340,7 @@ def identityFS(wf):
'-s':'HARVESTING:@standardValidation+@standardDQM+@miniAODValidation+@miniAODDQM', # todo: remove UP from label
'--conditions':'auto:run2_mc',
'--mc':'',
'--era' : 'Run2_25ns',
'--era' : 'Run2_2016',
'--filetype':'DQM',
}

Expand Down
10 changes: 7 additions & 3 deletions Configuration/Skimming/python/Skims_PDWG_cff.py
Expand Up @@ -142,9 +142,13 @@

#####################
# For the Data on Data Mixing in TSG
from HLTrigger.Configuration.HLT_FULL_cff import fragment as _fragment
hltGtDigis = _fragment.hltGtDigis.clone()
hltGtDigisPath = cms.Path(hltGtDigis)
from HLTrigger.Configuration.HLT_Fake1_cff import fragment as _fragment
if "hltGtDigis" in _fragment.__dict__:
hltGtDigis = _fragment.hltGtDigis.clone()
hltGtDigisPath = cms.Path(hltGtDigis)
else:
hltBoolEnd = _fragmet.hltBoolEnd.clone()
hltGtDigisPath = cms.Path(hltBoolEnd)

# The events to be used as PileUp
from Configuration.Skimming.PDWG_HLTZEROBIASPU_SD_cff import *
Expand Down
89 changes: 66 additions & 23 deletions HLTrigger/Configuration/python/CustomConfigs.py
Expand Up @@ -22,9 +22,9 @@ def Base(process):

process.MessageLogger.categories.append('TriggerSummaryProducerAOD')
process.MessageLogger.categories.append('L1GtTrigReport')
process.MessageLogger.categories.append('L1TGlobalSummary')
process.MessageLogger.categories.append('HLTrigReport')

#
# No longer override - instead use GT config as provided via cmsDriver
## override the GlobalTag, connection string and pfnPrefix
# if 'GlobalTag' in process.__dict__:
Expand All @@ -41,14 +41,25 @@ def Base(process):
def L1T(process):
# modifications when running L1T only

process.load('L1Trigger.GlobalTriggerAnalyzer.l1GtTrigReport_cfi')
labels = ['gtDigis','simGtDigis','newGtDigis','hltGtDigis']
for label in labels:
if label in process.__dict__:
process.load('L1Trigger.GlobalTriggerAnalyzer.l1GtTrigReport_cfi')
process.l1GtTrigReport.L1GtRecordInputTag = cms.InputTag( label )
process.L1AnalyzerEndpath = cms.EndPath( process.l1GtTrigReport )
process.schedule.append(process.L1AnalyzerEndpath)

process.L1AnalyzerEndpath = cms.EndPath( process.l1GtTrigReport )
process.schedule.append(process.L1AnalyzerEndpath)
labels = ['gtStage2Digis','simGtStage2Digis','newGtStage2Digis','hltGtStage2Digis']
for label in labels:
if label in process.__dict__:
process.load('L1Trigger.L1TGlobal.L1TGlobalSummary_cfi')
process.L1TGlobalSummary.AlgInputTag = cms.InputTag( label )
process.L1TGlobalSummary.ExtInputTag = cms.InputTag( label )
process.L1TAnalyzerEndpath = cms.EndPath(process.L1TGlobalSummary )
process.schedule.append(process.L1TAnalyzerEndpath)

if hasattr(process,'TriggerMenu'):
delattr(process,'TriggerMenu')

process=Base(process)

Expand All @@ -59,12 +70,22 @@ def L1THLT(process):
# modifications when running L1T+HLT

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.hltGtDigis + process.hltL1GtTrigReport + process.hltTrigReport)
process.schedule.append(process.HLTAnalyzerEndpath)
if 'hltGtDigis' in process.__dict__:
from HLTrigger.Configuration.HLT_Fake_cff import fragment
process.hltL1GtTrigReport = fragment.hltL1GtTrigReport
process.hltTrigReport = fragment.hltTrigReport
process.HLTAnalyzerEndpath = cms.EndPath(process.hltGtDigis + process.hltL1GtTrigReport + process.hltTrigReport)
process.schedule.append(process.HLTAnalyzerEndpath)

if 'hltGtStage2ObjectMap' in process.__dict__:
from HLTrigger.Configuration.HLT_FULL_cff import fragment
process.hltL1TGlobalSummary = fragment.hltL1TGlobalSummary
process.hltTrigReport = fragment.hltTrigReport
process.HLTAnalyzerEndpath = cms.EndPath(process.hltGtStage2Digis + process.hltL1TGlobalSummary + process.hltTrigReport)
process.schedule.append(process.HLTAnalyzerEndpath)

if hasattr(process,'TriggerMenu'):
delattr(process,'TriggerMenu')

process=Base(process)

Expand Down Expand Up @@ -104,18 +125,40 @@ def MassReplaceParameter(process,name="label",old="rawDataCollector",new="rawDat
return(process)

def L1REPACK(process):
# Replace only the L1 parts and keep the rest
if 'DigiToRaw' in process.__dict__:
process.DigiToRaw = cms.Sequence(process.l1tDigiToRawSeq + process.l1GtPack + process.l1GtEvmPack + process.rawDataCollector)
if 'rawDataCollector' in process.__dict__:
process.rawDataCollector.RawCollectionList = cms.VInputTag(
cms.InputTag('gctDigiToRaw'),
cms.InputTag('l1tDigiToRaw'),
cms.InputTag('l1GtPack'),
cms.InputTag('l1GtEvmPack'),
cms.InputTag('rawDataCollector', processName=cms.InputTag.skipCurrentProcess())
)

process=L1T(process)

from Configuration.StandardSequences.Eras import eras

l1repack = cms.Process('L1REPACK',eras.Run2_2016)
l1repack.load('Configuration.StandardSequences.SimL1EmulatorRepack_Full_cff')

for module in l1repack.es_sources_():
if (not hasattr(process,module)):
setattr(process,module,getattr(l1repack,module))
for module in l1repack.es_producers_():
if (not hasattr(process,module)):
setattr(process,module,getattr(l1repack,module))

for module in l1repack.SimL1Emulator.expandAndClone().moduleNames():
setattr(process,module,getattr(l1repack,module))
process.SimL1Emulator = l1repack.SimL1Emulator

for path in process.paths_():
getattr(process,path).insert(0,process.SimL1Emulator)
for path in process.endpaths_():
getattr(process,path).insert(0,process.SimL1Emulator)

return process

def L1XML(process,xmlFile=None):

# xmlFile="L1Menu_Collisions2016_dev_v3.xml"

if ((xmlFile is None) or (xmlFile=="")):
return process

process.L1TriggerMenu= cms.ESProducer("L1TUtmTriggerMenuESProducer",
L1TriggerMenuFile= cms.string(xmlFile)
)
process.ESPreferL1TXML = cms.ESPrefer("L1TUtmTriggerMenuESProducer","L1TriggerMenu")

return process