diff --git a/Configuration/HLT/python/autoCondHLT.py b/Configuration/HLT/python/autoCondHLT.py index 7e19d1956d1da..9f129ca91e2ab 100644 --- a/Configuration/HLT/python/autoCondHLT.py +++ b/Configuration/HLT/python/autoCondHLT.py @@ -18,15 +18,25 @@ l1Menus= { '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"] ), ), - 'Fake2' : ( ','.join( [ 'L1Menu_Collisions2017_dev_r5_m4_patch_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-05-19 10:21:02.000"] ), ), - 'FULL' : ( ','.join( [ 'L1Menu_Collisions2017_dev_r5_m4_patch_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-05-19 10:21:02.000"] ), ), - 'GRun' : ( ','.join( [ 'L1Menu_Collisions2017_dev_r5_m4_patch_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-05-19 10:21:02.000"] ), ), + 'Fake2' : ( ','.join( [ 'L1Menu_Collisions2017_dev_r5_m4_patch_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-05-19 10:21:02.000"] ), ), + 'FULL' : ( ','.join( [ 'L1Menu_Collisions2017_dev_r5_m4_patch_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-05-19 10:21:02.000"] ), ), + 'GRun' : ( ','.join( [ 'L1Menu_Collisions2017_dev_r5_m4_patch_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2017-05-19 10:21:02.000"] ), ), 'GRun2016' : ( ','.join( [ 'L1Menu_Collisions2016_v9_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-10-06 19:36:53.000"] ), ), 'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_uGT_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ), 'PIon' : ( ','.join( [ 'L1Menu_HeavyIons2016_v3_m2_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-11-22 11:11:00.000"] ), ), 'PRef' : ( ','.join( [ 'L1Menu_Collisions2015_5TeV_pp_reference_v5_uGT_v2_mc_xml',l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ), } +pfRecord = 'GBRDWrapperRcd' +pfTime = '2016-02-17 21:00:00.000' +pfscecal = () +for det in ('EB','EE'): + for obj in ('Correction','Uncertainty'): + pfLabel = 'pfscecal_'+det+obj+'_online' + pfTag = pfLabel+'_v0' + pfscecal = pfscecal + (','.join( [ pfTag,pfRecord,connectionString,pfLabel,pfTime] ), ) +pfscecal = pfscecal + (','.join( ['PFCalibration_HLT_2017_25ns_Spring17_V3_newCodeCompliant','PFCalibrationRcd',connectionString,'HLT','2017-06-22 21:00:00.000'] ), ) + hltGTs = { # 'symbolic GT' : ('base GT',[('payload1',payload2')]) @@ -46,29 +56,28 @@ 'run2_hlt_Fake' : ('run2_hlt_relval' ,l1Menus['Fake']), 'run2_hlt_Fake1' : ('run2_hlt_relval' ,l1Menus['Fake1']), 'run2_hlt_Fake2' : ('run2_hlt_relval' ,l1Menus['Fake2']), - 'run2_hlt_GRun2016' : ('run2_hlt' ,l1Menus['GRun2016']), - 'run2_hlt_FULL' : ('phase1_2017_realistic',l1Menus['FULL']), - 'run2_hlt_GRun' : ('phase1_2017_realistic',l1Menus['GRun']), + 'run2_hlt_GRun2016' : ('run2_hlt_relval' ,l1Menus['GRun2016']), + 'run2_hlt_FULL' : ('run2_hlt_relval' ,l1Menus['FULL']), + 'run2_hlt_GRun' : ('run2_hlt_relval' ,l1Menus['GRun']), 'run2_hlt_HIon' : ('run2_hlt_hi' ,l1Menus['HIon']), - 'run2_hlt_PIon' : ('phase1_2017_realistic',l1Menus['PIon']), - 'run2_hlt_PRef' : ('phase1_2017_realistic',l1Menus['PRef']), + 'run2_hlt_PIon' : ('run2_hlt_relval' ,l1Menus['PIon']), + 'run2_hlt_PRef' : ('run2_hlt_relval' ,l1Menus['PRef']), 'run1_data_Fake' : ('run1_data' ,l1Menus['Fake']), 'run2_data_Fake' : ('run2_data_relval' ,l1Menus['Fake']), 'run2_data_Fake1' : ('run2_data_relval' ,l1Menus['Fake1']), 'run2_data_Fake2' : ('run2_data_relval' ,l1Menus['Fake2']), - 'run2_data_GRun2016' : ('run2_data' ,l1Menus['GRun2016']), - 'run2_data_FULL' : ('phase1_2017_realistic',l1Menus['FULL']), - 'run2_data_GRun' : ('phase1_2017_realistic',l1Menus['GRun']), - 'run2_data_HIon' : ('run2_data' ,l1Menus['HIon']), - 'run2_data_PIon' : ('phase1_2017_realistic',l1Menus['PIon']), - 'run2_data_PRef' : ('phase1_2017_realistic',l1Menus['PRef']), - - 'phase1_2017_design_GRun' : ('phase1_2017_design' ,l1Menus['GRun']), - 'phase1_2017_realistic_GRun' : ('phase1_2017_realistic',l1Menus['GRun']), + 'run2_data_GRun2016' : ('run2_data_relval' ,l1Menus['GRun2016']), + 'run2_data_FULL' : ('TSG2_data_relval' ,l1Menus['FULL']+pfscecal), + 'run2_data_GRun' : ('TSG2_data_relval' ,l1Menus['GRun']+pfscecal), + 'run2_data_HIon' : ('run2_data_relval' ,l1Menus['HIon']), + 'run2_data_PIon' : ('TSG2_data_relval' ,l1Menus['PIon']+pfscecal), + 'run2_data_PRef' : ('TSG2_data_relval' ,l1Menus['PRef']+pfscecal), + } def autoCondHLT(autoCond): + autoCond['TSG2_data_relval'] = '92X_dataRun2_PromptLike_v0' # temporary for key,val in hltGTs.iteritems(): if len(val)==1 : autoCond[key] = ( autoCond[val[0]] ) diff --git a/Configuration/HLT/python/autoHLT.py b/Configuration/HLT/python/autoHLT.py index 9855ce1fbd5e5..6676ad58d9cc9 100644 --- a/Configuration/HLT/python/autoHLT.py +++ b/Configuration/HLT/python/autoHLT.py @@ -7,9 +7,7 @@ 'fake2' : 'Fake2', 'relval50ns' : 'Fake', 'relval25ns' : 'Fake1', - 'frozen2016' : 'GRun2016', 'relval2016' : 'Fake2', - 'frozen2017' : 'GRun', 'relval2017' : 'GRun', 'test' : 'GRun', } diff --git a/HLTrigger/Configuration/test/cmsDriver.csh b/HLTrigger/Configuration/test/cmsDriver.csh index 182176c233dd1..cc5c5947ce20f 100755 --- a/HLTrigger/Configuration/test/cmsDriver.csh +++ b/HLTrigger/Configuration/test/cmsDriver.csh @@ -49,8 +49,8 @@ set BASE2RD = auto:run2_data set NNPPMC = 100 set NNPPRD = 100 -set NNHIMC = 25 -set NNHIRD = 25 +set NNPRMC = 20 +set NNPRRD = 20 set EraRun1 = " " set EraRun25ns = " --era=Run2_25ns " @@ -87,7 +87,7 @@ foreach gtag ( MC DATA ) set BASE1 = $BASE1HLT set BASE2 = $BASE2HLT set NNPP = $NNPPRD - set NNHI = $NNHIRD + set NNPR = $NNPRRD set DATAMC = --data set PNAME = HLT1 set RNAME = RECO1 @@ -95,7 +95,7 @@ foreach gtag ( MC DATA ) set BASE1 = $BASE1MC set BASE2 = $BASE2MC set NNPP = $NNPPMC - set NNHI = $NNHIMC + set NNPR = $NNPRMC set DATAMC = --mc set PNAME = HLT set RNAME = RECO @@ -203,7 +203,7 @@ foreach gtag ( MC DATA ) set XHLT = HLT:HIon set GTAG = ${BASE2}_HIon set RTAG = ${BASE2RD}_HIon - set NN = $NNHI + set NN = $NNPP set SCEN = HeavyIons set InputGenSim = $InputGenSimHIon1 set InputLHCRaw = $InputLHCRawHIon1 @@ -227,7 +227,7 @@ foreach gtag ( MC DATA ) set XHLT = HLT:PRef set GTAG = ${BASE2}_PRef set RTAG = ${BASE2RD}_PRef - set NN = $NNPP + set NN = $NNPR set SCEN = pp set InputGenSim = $InputGenSimPRef3 set InputLHCRaw = $InputLHCRawPRef3 diff --git a/Utilities/ReleaseScripts/scripts/addOnTests.py b/Utilities/ReleaseScripts/scripts/addOnTests.py index f3eb1f7ea9f2e..9b1b892408d05 100755 --- a/Utilities/ReleaseScripts/scripts/addOnTests.py +++ b/Utilities/ReleaseScripts/scripts/addOnTests.py @@ -132,16 +132,16 @@ def prepare(self): 'hlt_data_GRun2016' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_GRun2016 --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2016 --magField 38T_PostLS1 --fileout file:RelVal_Raw_GRun2016_DATA.root --filein /store/data/Run2016B/JetHT/RAW/v1/000/272/762/00000/C666CDE2-E013-E611-B15A-02163E011DBE.root', 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_GRun2016.py')+hltFlag_data, 'cmsDriver.py RelVal -s HLT:GRun2016,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_GRun2016 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2016 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_GRun2016_DATA.root --fileout file:RelVal_Raw_GRun2016_DATA_HLT_RECO.root'], - 'hlt_data_GRun' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_GRun --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2017 --magField 38T_PostLS1 --fileout file:RelVal_Raw_GRun_DATA.root --filein /store/data/Run2016B/JetHT/RAW/v1/000/272/762/00000/C666CDE2-E013-E611-B15A-02163E011DBE.root', + 'hlt_data_GRun' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_GRun --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2017 --magField 38T_PostLS1 --fileout file:RelVal_Raw_GRun_DATA.root --filein /store/data/Run2017A/HLTPhysics4/RAW/v1/000/295/606/00000/36DE5E0A-3645-E711-8FA1-02163E01A43B.root', 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_GRun.py')+hltFlag_data, 'cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_GRun_DATA.root --fileout file:RelVal_Raw_GRun_DATA_HLT_RECO.root'], 'hlt_data_HIon' : ['cmsDriver.py RelVal -s L1REPACK:Full2015Data --data --scenario=HeavyIons -n 10 --conditions auto:run2_hlt_HIon --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2016,Run2_HI --magField 38T_PostLS1 --fileout file:RelVal_Raw_HIon_DATA.root --filein /store/hidata/HIRun2015/HIHardProbes/RAW-RECO/HighPtJet-PromptReco-v1/000/263/689/00000/1802CD9A-DDB8-E511-9CF9-02163E0138CA.root', 'cmsRun '+self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_HIon.py')+hltFlag_data, 'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --data --scenario=HeavyIons -n 10 --conditions auto:run2_data_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2016,Run2_HI --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_HIon_DATA.root --fileout file:RelVal_Raw_HIon_DATA_HLT_RECO.root'], - 'hlt_data_PIon' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_PIon --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2017 --magField 38T_PostLS1 --eventcontent RAW --fileout file:RelVal_Raw_PIon_DATA.root --filein /store/data/Run2016B/JetHT/RAW/v1/000/272/762/00000/C666CDE2-E013-E611-B15A-02163E011DBE.root', + 'hlt_data_PIon' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_PIon --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2017 --magField 38T_PostLS1 --eventcontent RAW --fileout file:RelVal_Raw_PIon_DATA.root --filein /store/data/Run2017A/HLTPhysics4/RAW/v1/000/295/606/00000/36DE5E0A-3645-E711-8FA1-02163E01A43B.root', 'cmsRun ' + self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_PIon.py')+hltFlag_data, 'cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PIon_DATA.root --fileout file:RelVal_Raw_PIon_DATA_HLT_RECO.root'], - 'hlt_data_PRef' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_PRef --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2017 --magField 38T_PostLS1 --eventcontent RAW --fileout file:RelVal_Raw_PRef_DATA.root --filein /store/data/Run2016B/JetHT/RAW/v1/000/272/762/00000/C666CDE2-E013-E611-B15A-02163E011DBE.root', + 'hlt_data_PRef' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_PRef --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2017 --magField 38T_PostLS1 --eventcontent RAW --fileout file:RelVal_Raw_PRef_DATA.root --filein /store/data/Run2017A/HLTPhysics4/RAW/v1/000/295/606/00000/36DE5E0A-3645-E711-8FA1-02163E01A43B.root', 'cmsRun ' + self.file2Path('HLTrigger/Configuration/test/OnLine_HLT_PRef.py')+hltFlag_data, 'cmsDriver.py RelVal -s HLT:PRef,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_PRef --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --era Run2_2017 --magField 38T_PostLS1 --processName=HLTRECO --filein file:RelVal_Raw_PRef_DATA.root --fileout file:RelVal_Raw_PRef_DATA_HLT_RECO.root'], }