From a4e6c057ad744429e529cc92219d8cdd12286dc9 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Thu, 8 Sep 2016 10:24:05 -0500 Subject: [PATCH 01/18] add additional hcal 2017 sub-Eras --- Configuration/Eras/python/Era_Run2_2017_cff.py | 4 +++- Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py | 4 ++++ Configuration/Eras/python/Modifier_run2_HF_2017_cff.py | 4 ++++ Configuration/StandardSequences/python/Eras.py | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py create mode 100644 Configuration/Eras/python/Modifier_run2_HF_2017_cff.py diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py index 3428301b513d1..9f3527fa85e31 100644 --- a/Configuration/Eras/python/Era_Run2_2017_cff.py +++ b/Configuration/Eras/python/Era_Run2_2017_cff.py @@ -4,6 +4,8 @@ from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017 +from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 -Run2_2017 = cms.ModifierChain(Run2_2016, phase1Pixel, trackingPhase1, run2_HE_2017) +Run2_2017 = cms.ModifierChain(Run2_2016, phase1Pixel, trackingPhase1, run2_HE_2017, run2_HF_2017, run2_HCAL_2017) diff --git a/Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py b/Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py new file mode 100644 index 0000000000000..839f4ba007af6 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +run2_HCAL_2017 = cms.Modifier() + diff --git a/Configuration/Eras/python/Modifier_run2_HF_2017_cff.py b/Configuration/Eras/python/Modifier_run2_HF_2017_cff.py new file mode 100644 index 0000000000000..6de1b3eb99353 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run2_HF_2017_cff.py @@ -0,0 +1,4 @@ +import FWCore.ParameterSet.Config as cms + +run2_HF_2017 = cms.Modifier() + diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index e615670f33974..13a588c7da59e 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -29,6 +29,7 @@ def __init__(self): 'run2_50ns_specific', 'run2_HI_specific', 'stage1L1Trigger', 'fastSim', 'run2_HE_2017', 'stage2L1Trigger', + 'run2_HF_2017', 'run2_HCAL_2017', 'phase1Pixel', 'phase1PixelNewFPix', 'run3_GEM', 'phase2_common', 'phase2_tracker', 'phase2_hgcal', 'phase2_muon', 'phase2_timing', From bf5f1f2e0f9114b38e858b8c8d317f8d004993b8 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 9 Sep 2016 10:31:25 -0500 Subject: [PATCH 02/18] customizations for hcal phase1 packer --- .../python/DigiToRawDM_cff.py | 19 +++++++++++++++---- .../HcalRawToDigi/python/HcalDigiToRaw_cfi.py | 15 ++++++++++++++- .../python/rawDataCollector_cfi.py | 3 ++- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/Configuration/StandardSequences/python/DigiToRawDM_cff.py b/Configuration/StandardSequences/python/DigiToRawDM_cff.py index 5f2c33bc86e0a..e319dc1df4343 100644 --- a/Configuration/StandardSequences/python/DigiToRawDM_cff.py +++ b/Configuration/StandardSequences/python/DigiToRawDM_cff.py @@ -16,10 +16,10 @@ ecalPacker.labelTT = cms.InputTag('DMEcalTriggerPrimitiveDigis') esDigiToRaw.Label = cms.string('DMEcalPreshowerDigis') # -hcalRawData.HBHE = cms.untracked.InputTag("DMHcalDigis") -hcalRawData.HF = cms.untracked.InputTag("DMHcalDigis") -hcalRawData.HO = cms.untracked.InputTag("DMHcalDigis") -hcalRawData.ZDC = cms.untracked.InputTag("mixData") +hcalRawDataVME.HBHE = cms.untracked.InputTag("DMHcalDigis") +hcalRawDataVME.HF = cms.untracked.InputTag("DMHcalDigis") +hcalRawDataVME.HO = cms.untracked.InputTag("DMHcalDigis") +hcalRawDataVME.ZDC = cms.untracked.InputTag("mixData") # cscpacker.wireDigiTag = cms.InputTag("mixData","MuonCSCWireDigisDM") cscpacker.stripDigiTag = cms.InputTag("mixData","MuonCSCStripDigisDM") @@ -32,3 +32,14 @@ #castorRawData.CASTOR = cms.untracked.InputTag("castorDigis") # + +from Configuration.StandardSequences.Eras import eras +eras.run2_HCAL_2017.toModify( hcalRawDataVME, + HBHE = cms.untracked.InputTag(""), + HF = cms.untracked.InputTag(""), +) +eras.run2_HCAL_2017.toModify( hcalRawDatauHTR, + HBHE = cms.untracked.InputTag("DMHcalDigis"), + HF = cms.untracked.InputTag("DMHcalDigis") +) + diff --git a/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py b/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py index 5b030ec2e06b3..8ecaf01aa469f 100644 --- a/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py +++ b/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms -hcalRawData = cms.EDProducer("HcalDigiToRaw", + +hcalRawDataVME = cms.EDProducer("HcalDigiToRaw", HBHE = cms.untracked.InputTag("simHcalDigis"), HF = cms.untracked.InputTag("simHcalDigis"), HO = cms.untracked.InputTag("simHcalDigis"), @@ -8,5 +9,17 @@ TRIG = cms.untracked.InputTag("simHcalTriggerPrimitiveDigis") ) +hcalRawData = cms.Sequence(hcalRawDataVME) + +from EventFilter.HcalRawToDigi.hcalDigiToRawuHTR_cfi import hcalDigiToRawuHTR as hcalRawDatauHTR +_phase1_hcalRawData = hcalRawData.copy() +_phase1_hcalRawData += hcalRawDatauHTR +from Configuration.StandardSequences.Eras import eras +eras.run2_HCAL_2017.toModify( hcalRawDataVME, + HBHE = cms.untracked.InputTag(""), + HF = cms.untracked.InputTag(""), + TRIG = cms.untracked.InputTag("") +) +eras.run2_HCAL_2017.toReplaceWith(hcalRawData,_phase1_hcalRawData) diff --git a/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py b/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py index b4766f8277d2e..0441674077834 100644 --- a/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py +++ b/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py @@ -11,7 +11,7 @@ cms.InputTag('ecalPacker'), cms.InputTag('esDigiToRaw'), cms.InputTag('gctDigiToRaw'), - cms.InputTag('hcalRawData'), + cms.InputTag('hcalRawDataVME'), cms.InputTag('l1GtEvmPack'), cms.InputTag('l1GtPack'), cms.InputTag('rpcpacker'), @@ -24,3 +24,4 @@ # from Configuration.StandardSequences.Eras import eras eras.stage1L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("l1tDigiToRaw")) ) +eras.run2_HCAL_2017.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("hcalRawDatauHTR")) ) From 4eb39a0428cb3cf740b06322401934b8905c1c52 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 9 Sep 2016 11:27:32 -0500 Subject: [PATCH 03/18] customizations for hcal phase1 reco --- .../Configuration/python/hcalLocalReco_cff.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py index 4d1ceca6a7a6b..bbb4c9998a0e0 100644 --- a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py +++ b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py @@ -20,3 +20,15 @@ eras.phase2_hcal.toModify( hfreco, digiLabel = cms.InputTag('simHcalDigis','HFUpgradeDigiCollection') ) eras.phase2_hcal.toModify( zdcreco, digiLabel = cms.InputTag('simHcalUnsuppressedDigis'), digiLabelhcal = cms.InputTag('simHcalUnsuppressedDigis') ) eras.phase2_hcal.toReplaceWith( hcalLocalRecoSequence, _phase2_hcalLocalRecoSequence ) + +from RecoLocalCalo.HcalRecProducers.hfprereco_cfi import hfprereco +from RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi import hfreco as _phase1_hfreco +from RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi import hbheprereco as _phase1_hbheprereco + +_phase1_hcalLocalRecoSequence = hcalLocalRecoSequence.copy() +_phase1_hcalLocalRecoSequence.insert(_phase1_hcalLocalRecoSequence.index(hbheprereco),hfprereco) + +eras.run2_HF_2017.toReplaceWith( hcalLocalRecoSequence, _phase1_hcalLocalRecoSequence ) +eras.run2_HF_2017.toReplaceWith( hfreco, _phase1_hfreco ) +eras.run2_HE_2017.toReplaceWith( hbheprereco, _phase1_hbheprereco ) +eras.run2_HE_2017.toModify( hbheprereco, saveInfos = cms.bool(True) ) From 0afa935d7f4d87b3cd95bac9a879aa7c0a519969 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 9 Sep 2016 11:58:46 -0500 Subject: [PATCH 04/18] customizations for hcal phase1 dqm --- DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py | 8 ++++++++ DQM/HcalTasks/python/OfflineSourceSequence_hi.py | 8 ++++++++ DQM/HcalTasks/python/OfflineSourceSequence_pp.py | 7 +++++++ 3 files changed, 23 insertions(+) diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py b/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py index b67000b6525a3..64eb7addf4653 100644 --- a/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py +++ b/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py @@ -7,12 +7,14 @@ # import the tasks from DQM.HcalTasks.DigiTask import digiTask +from DQM.HcalTasks.DigiPhase1Task import digiPhase1Task from DQM.HcalTasks.RawTask import rawTask from DQM.HcalTasks.TPTask import tpTask from DQM.HcalTasks.RecHitTask import recHitTask # set processing type to Offine digiTask.ptype = cms.untracked.int32(1) +digiPhase1Task.ptype = cms.untracked.int32(1) tpTask.ptype = cms.untracked.int32(1) recHitTask.ptype = cms.untracked.int32(1) rawTask.ptype = cms.untracked.int32(1) @@ -36,3 +38,9 @@ +recHitTask +rawTask) +_phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy() +_phase1_hcalOfflineSourceSequence.insert(_phase1_hcalOfflineSourceSequence.index(digiTask),digiPhase1Task) + +from Configuration.StandardSequences.Eras import eras +eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) + diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_hi.py b/DQM/HcalTasks/python/OfflineSourceSequence_hi.py index 6f61ce7ba72e8..4a119262aeb1a 100644 --- a/DQM/HcalTasks/python/OfflineSourceSequence_hi.py +++ b/DQM/HcalTasks/python/OfflineSourceSequence_hi.py @@ -7,12 +7,14 @@ # import the tasks from DQM.HcalTasks.DigiTask import digiTask +from DQM.HcalTasks.DigiPhase1Task import digiPhase1Task from DQM.HcalTasks.RawTask import rawTask from DQM.HcalTasks.TPTask import tpTask from DQM.HcalTasks.RecHitTask import recHitTask # set processing type to Offine digiTask.ptype = cms.untracked.int32(1) +from DQM.HcalTasks.DigiPhase1Task import digiPhase1Task tpTask.ptype = cms.untracked.int32(1) recHitTask.ptype = cms.untracked.int32(1) rawTask.ptype = cms.untracked.int32(1) @@ -37,3 +39,9 @@ +recHitTask +rawTask) +_phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy() +_phase1_hcalOfflineSourceSequence.insert(_phase1_hcalOfflineSourceSequence.index(digiTask),digiPhase1Task) + +from Configuration.StandardSequences.Eras import eras +eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) + diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_pp.py b/DQM/HcalTasks/python/OfflineSourceSequence_pp.py index 17d20f4df2c1d..ebd6391f1b5f9 100644 --- a/DQM/HcalTasks/python/OfflineSourceSequence_pp.py +++ b/DQM/HcalTasks/python/OfflineSourceSequence_pp.py @@ -7,12 +7,14 @@ # import the tasks from DQM.HcalTasks.DigiTask import digiTask +from DQM.HcalTasks.DigiPhase1Task import digiPhase1Task from DQM.HcalTasks.RawTask import rawTask from DQM.HcalTasks.TPTask import tpTask from DQM.HcalTasks.RecHitTask import recHitTask # set processing type to Offine digiTask.ptype = cms.untracked.int32(1) +digiPhase1Task.ptype = cms.untracked.int32(1) tpTask.ptype = cms.untracked.int32(1) recHitTask.ptype = cms.untracked.int32(1) rawTask.ptype = cms.untracked.int32(1) @@ -26,3 +28,8 @@ +recHitTask +rawTask) +_phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy() +_phase1_hcalOfflineSourceSequence.insert(_phase1_hcalOfflineSourceSequence.index(digiTask),digiPhase1Task) + +from Configuration.StandardSequences.Eras import eras +eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) From bfe444b4df4cb1d6a38385e2fb559feff781870d Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Mon, 12 Sep 2016 10:14:40 -0500 Subject: [PATCH 05/18] fix hf prereco collection --- RecoLocalCalo/HcalRecProducers/python/hfprereco_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoLocalCalo/HcalRecProducers/python/hfprereco_cfi.py b/RecoLocalCalo/HcalRecProducers/python/hfprereco_cfi.py index 093e797ea1d52..fe39a91a086e5 100644 --- a/RecoLocalCalo/HcalRecProducers/python/hfprereco_cfi.py +++ b/RecoLocalCalo/HcalRecProducers/python/hfprereco_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms hfprereco = cms.EDProducer("HFPreReconstructor", - digiLabel = cms.InputTag("hcalDigis", "HFQIE10DigiCollection"), + digiLabel = cms.InputTag("hcalDigis"), dropZSmarkedPassed = cms.bool(True), tsFromDB = cms.bool(False) ) From ff46989ee997d6835ed2ad13ddebfcb9fb7b8468 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Tue, 13 Sep 2016 02:40:55 -0500 Subject: [PATCH 06/18] update geometry for 2017 workflow --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- Configuration/StandardSequences/python/GeometryConf.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index f297eb37758e3..403b6a0127445 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -56,7 +56,7 @@ upgradeProperties[2017] = { '2017' : { - 'Geom' : 'DB:Extended', + 'Geom' : 'Extended2017dev', 'GT' : 'auto:phase1_2017_realistic', 'Era' : 'Run2_2017', 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index c527581afc18a..8df3821ca7462 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -22,6 +22,7 @@ 'Extended2015dev': 'Extended2015dev,Extended2015devReco', 'Extended2016' : 'Extended2016,Extended2016Reco', 'Extended2017' : 'Extended2017,Extended2017Reco', + 'Extended2017dev': 'Extended2017dev,Extended2017devReco', 'Extended2019' : 'Extended2019,Extended2019Reco', 'ExtendedGFlash' : 'ExtendedGFlash,ExtendedGFlashReco', 'All' : 'Configuration.Geometry.GeometrySimAll_cff,Reco', From 61abaf563b395e66c84a3942eebed8cc616c1735 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 17 Sep 2016 08:13:33 +0200 Subject: [PATCH 07/18] use hcaldev tag for workflow --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 403b6a0127445..699a67e81b049 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -57,7 +57,7 @@ upgradeProperties[2017] = { '2017' : { 'Geom' : 'Extended2017dev', - 'GT' : 'auto:phase1_2017_realistic', + 'GT' : 'auto:phase1_2017_hcaldev', 'Era' : 'Run2_2017', 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], }, From e3418e2413e98386b2f263bf4c09c9ca53182e30 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 18 Sep 2016 05:49:34 +0200 Subject: [PATCH 08/18] safer sequence inserts --- DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py | 2 +- DQM/HcalTasks/python/OfflineSourceSequence_hi.py | 2 +- DQM/HcalTasks/python/OfflineSourceSequence_pp.py | 2 +- RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py b/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py index 64eb7addf4653..335ea09716bc6 100644 --- a/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py +++ b/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py @@ -39,7 +39,7 @@ +rawTask) _phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy() -_phase1_hcalOfflineSourceSequence.insert(_phase1_hcalOfflineSourceSequence.index(digiTask),digiPhase1Task) +_phase1_hcalOfflineSourceSequence.insert(0,digiPhase1Task) from Configuration.StandardSequences.Eras import eras eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_hi.py b/DQM/HcalTasks/python/OfflineSourceSequence_hi.py index 4a119262aeb1a..6f8cf378747ae 100644 --- a/DQM/HcalTasks/python/OfflineSourceSequence_hi.py +++ b/DQM/HcalTasks/python/OfflineSourceSequence_hi.py @@ -40,7 +40,7 @@ +rawTask) _phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy() -_phase1_hcalOfflineSourceSequence.insert(_phase1_hcalOfflineSourceSequence.index(digiTask),digiPhase1Task) +_phase1_hcalOfflineSourceSequence.insert(0,digiPhase1Task) from Configuration.StandardSequences.Eras import eras eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_pp.py b/DQM/HcalTasks/python/OfflineSourceSequence_pp.py index ebd6391f1b5f9..22d5c042c2e65 100644 --- a/DQM/HcalTasks/python/OfflineSourceSequence_pp.py +++ b/DQM/HcalTasks/python/OfflineSourceSequence_pp.py @@ -29,7 +29,7 @@ +rawTask) _phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy() -_phase1_hcalOfflineSourceSequence.insert(_phase1_hcalOfflineSourceSequence.index(digiTask),digiPhase1Task) +_phase1_hcalOfflineSourceSequence.insert(0,digiPhase1Task) from Configuration.StandardSequences.Eras import eras eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) diff --git a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py index bbb4c9998a0e0..88483ffe7a84c 100644 --- a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py +++ b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py @@ -26,7 +26,7 @@ from RecoLocalCalo.HcalRecProducers.HBHEPhase1Reconstructor_cfi import hbheprereco as _phase1_hbheprereco _phase1_hcalLocalRecoSequence = hcalLocalRecoSequence.copy() -_phase1_hcalLocalRecoSequence.insert(_phase1_hcalLocalRecoSequence.index(hbheprereco),hfprereco) +_phase1_hcalLocalRecoSequence.insert(0,hfprereco) eras.run2_HF_2017.toReplaceWith( hcalLocalRecoSequence, _phase1_hcalLocalRecoSequence ) eras.run2_HF_2017.toReplaceWith( hfreco, _phase1_hfreco ) From 909daed1654307a0853fe60e6c42c894b5f4bc53 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 19 Sep 2016 23:23:28 +0200 Subject: [PATCH 09/18] use HFFlexibleTimeCheck --- .../HcalRecProducers/python/HFPhase1Reconstructor_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoLocalCalo/HcalRecProducers/python/HFPhase1Reconstructor_cfi.py b/RecoLocalCalo/HcalRecProducers/python/HFPhase1Reconstructor_cfi.py index 1a337b6caee81..027de7482656a 100644 --- a/RecoLocalCalo/HcalRecProducers/python/HFPhase1Reconstructor_cfi.py +++ b/RecoLocalCalo/HcalRecProducers/python/HFPhase1Reconstructor_cfi.py @@ -16,7 +16,7 @@ # Configure the reconstruction algorithm algorithm = cms.PSet( - Class = cms.string("HFSimpleTimeCheck"), + Class = cms.string("HFFlexibleTimeCheck"), # Timing cuts: pass everything for now tlimits = cms.vdouble(-1000.0, 1000.0, From 1046942486a1d4109a87971551120b2fbddeb141 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 20 Sep 2016 00:28:43 +0200 Subject: [PATCH 10/18] add usage comments for HCAL 2017 Eras --- Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py | 4 ++++ Configuration/Eras/python/Modifier_run2_HE_2017_cff.py | 2 ++ Configuration/Eras/python/Modifier_run2_HF_2017_cff.py | 2 ++ 3 files changed, 8 insertions(+) diff --git a/Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py b/Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py index 839f4ba007af6..dc68eb3f43b24 100644 --- a/Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py +++ b/Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py @@ -1,4 +1,8 @@ import FWCore.ParameterSet.Config as cms +# This modifier should be used for "common" HCAL 2017 customizations +# Initially, this means the packer and DQM +# subdetector-specific changes for sim, reco, etc. should go in run2_HE_2017 or run2_HF_2017 + run2_HCAL_2017 = cms.Modifier() diff --git a/Configuration/Eras/python/Modifier_run2_HE_2017_cff.py b/Configuration/Eras/python/Modifier_run2_HE_2017_cff.py index 43cd6f9729dfd..edde974927462 100644 --- a/Configuration/Eras/python/Modifier_run2_HE_2017_cff.py +++ b/Configuration/Eras/python/Modifier_run2_HE_2017_cff.py @@ -1,4 +1,6 @@ import FWCore.ParameterSet.Config as cms +# This modifier is for HE-specific changes for sim, reco, etc. + run2_HE_2017 = cms.Modifier() diff --git a/Configuration/Eras/python/Modifier_run2_HF_2017_cff.py b/Configuration/Eras/python/Modifier_run2_HF_2017_cff.py index 6de1b3eb99353..0e00bac2f5241 100644 --- a/Configuration/Eras/python/Modifier_run2_HF_2017_cff.py +++ b/Configuration/Eras/python/Modifier_run2_HF_2017_cff.py @@ -1,4 +1,6 @@ import FWCore.ParameterSet.Config as cms +# This modifier is for HF-specific changes for sim, reco, etc. + run2_HF_2017 = cms.Modifier() From 256242e0073e03ef608afa7714eba3e80d7b88e7 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Wed, 21 Sep 2016 11:59:53 -0500 Subject: [PATCH 11/18] separate Era and workflow for HCALdev 2017 --- Configuration/Eras/python/Era_Run2_2017_cff.py | 4 +--- .../PyReleaseValidation/python/relval_2017.py | 4 ++-- .../python/upgradeWorkflowComponents.py | 15 +++++++++++---- .../PyReleaseValidation/scripts/runTheMatrix.py | 1 + Configuration/StandardSequences/python/Eras.py | 1 + 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py index 9f3527fa85e31..3428301b513d1 100644 --- a/Configuration/Eras/python/Era_Run2_2017_cff.py +++ b/Configuration/Eras/python/Era_Run2_2017_cff.py @@ -4,8 +4,6 @@ from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017 -from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 -from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 -Run2_2017 = cms.ModifierChain(Run2_2016, phase1Pixel, trackingPhase1, run2_HE_2017, run2_HF_2017, run2_HCAL_2017) +Run2_2017 = cms.ModifierChain(Run2_2016, phase1Pixel, trackingPhase1, run2_HE_2017) diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index fc3c09ca1356d..4fda343853078 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -15,8 +15,8 @@ numWFStart=10000 numWFSkip=200 -#2017 WFs to run in IB (TenMuE_0_200, TTbar, ZEE, MinBias, TTbar PU, ZEE PU,TTbar NewPIX) -numWFIB = [10021.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0] +#2017 WFs to run in IB (TenMuE_0_200, TTbar, ZEE, MinBias, TTbar PU, ZEE PU,TTbar NewPIX,TTbar HCALdev) +numWFIB = [10021.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0,10624.0] for i,key in enumerate(upgradeKeys[2017]): numWF=numWFStart+i*numWFSkip for frag in upgradeFragments: diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 699a67e81b049..963dd6ca668fd 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -7,7 +7,8 @@ upgradeKeys[2017] = [ '2017', '2017PU', - '2017NewFPix' + '2017NewFPix', + '2017HCALdev', ] upgradeKeys[2023] = [ @@ -56,8 +57,8 @@ upgradeProperties[2017] = { '2017' : { - 'Geom' : 'Extended2017dev', - 'GT' : 'auto:phase1_2017_hcaldev', + 'Geom' : 'DB:Extended', + 'GT' : 'auto:phase1_2017_realistic', 'Era' : 'Run2_2017', 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], }, @@ -66,7 +67,13 @@ 'GT' : 'auto:phase1_2017_realistic', 'Era' : 'Run2_2017_NewFPix', 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], - }, + }, + '2017HCALdev' : { + 'Geom' : 'Extended2017dev', + 'GT' : 'auto:phase1_2017_hcaldev', + 'Era' : 'Run2_2017_HCALdev', + 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], + }, } upgradeProperties[2017]['2017PU'] = deepcopy(upgradeProperties[2017]['2017']) diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 3b0ff8dc640d2..0829f5984a09a 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -60,6 +60,7 @@ def runSelected(opt): 10021.0, #2017 tenmu 10024.0, #2017 ttbar 10424.0, #2017 NewPix ttbar + 10624.0, #2017 HCALdev ttbar 20024.0, #2023D1 ttbar (Run2 calo) 20824.0, #2023D3 ttbar (HGCal) ], diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 13a588c7da59e..341777aaaaa82 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -17,6 +17,7 @@ def __init__(self): 'Run2_2016_trackingLowPU', 'Run2_2017', 'Run2_2017_NewFPix', + 'Run2_2017_HCALdev', 'Run2_2017_trackingRun2', 'Run2_2017_trackingPhase1PU70', 'Run3', From 8393d1a02a7bf8507938cd9d343cff27b615475b Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Wed, 21 Sep 2016 13:56:42 -0500 Subject: [PATCH 12/18] use DB geom for HCAL 2017 --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 963dd6ca668fd..d0ca5ed687461 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -69,7 +69,7 @@ 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], }, '2017HCALdev' : { - 'Geom' : 'Extended2017dev', + 'Geom' : 'DB:Extended', 'GT' : 'auto:phase1_2017_hcaldev', 'Era' : 'Run2_2017_HCALdev', 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], From 68b20fd374f391f307a85bb92b7e736646f40b88 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Wed, 21 Sep 2016 14:57:14 -0500 Subject: [PATCH 13/18] add Era_Run2_2017_HCALdev --- .../Eras/python/Era_Run2_2017_HCALdev_cff.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py diff --git a/Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py b/Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py new file mode 100644 index 0000000000000..5907cb679102a --- /dev/null +++ b/Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py @@ -0,0 +1,11 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017 +from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 + +Run2_2017_HCALdev = cms.ModifierChain(Run2_2016, phase1Pixel, trackingPhase1, run2_HE_2017, run2_HF_2017, run2_HCAL_2017) + From 7fadf6c809893f54f075cd43d17d2866d2a0df71 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Thu, 22 Sep 2016 09:53:08 -0500 Subject: [PATCH 14/18] properly sync 2017 eras --- Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py b/Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py index 5907cb679102a..e1519987d4c7d 100644 --- a/Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py +++ b/Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py @@ -1,11 +1,8 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Run2_2016_cff import Run2_2016 -from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel -from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 -from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017 +from Configuration.Eras.Era_Run2_2017_cff import Run2_2017 from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 -Run2_2017_HCALdev = cms.ModifierChain(Run2_2016, phase1Pixel, trackingPhase1, run2_HE_2017, run2_HF_2017, run2_HCAL_2017) +Run2_2017_HCALdev = cms.ModifierChain(Run2_2017, run2_HF_2017, run2_HCAL_2017) From b1543bb7040cab854112de517decb72888d98c5f Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Thu, 22 Sep 2016 09:53:40 -0500 Subject: [PATCH 15/18] revert to xml geom --- .../PyReleaseValidation/python/upgradeWorkflowComponents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index d0ca5ed687461..963dd6ca668fd 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -69,7 +69,7 @@ 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], }, '2017HCALdev' : { - 'Geom' : 'DB:Extended', + 'Geom' : 'Extended2017dev', 'GT' : 'auto:phase1_2017_hcaldev', 'Era' : 'Run2_2017_HCALdev', 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], From a14deaa98c5bd39df2bfd08d8fa29eb8399c97fd Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Thu, 22 Sep 2016 10:08:16 -0500 Subject: [PATCH 16/18] add combined '2017 new' workflow with all HCAL and pixel changes --- .../Eras/python/Era_Run2_2017_new_cff.py | 9 + .../python/GeometryExtended2017newReco_cff.py | 33 ++ .../python/GeometryExtended2017new_cff.py | 11 + .../python/upgradeWorkflowComponents.py | 7 + .../StandardSequences/python/Eras.py | 1 + .../StandardSequences/python/GeometryConf.py | 1 + .../cmsExtendedGeometry2017newXML_cfi.py | 285 ++++++++++++++++++ 7 files changed, 347 insertions(+) create mode 100644 Configuration/Eras/python/Era_Run2_2017_new_cff.py create mode 100644 Configuration/Geometry/python/GeometryExtended2017newReco_cff.py create mode 100644 Configuration/Geometry/python/GeometryExtended2017new_cff.py create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2017newXML_cfi.py diff --git a/Configuration/Eras/python/Era_Run2_2017_new_cff.py b/Configuration/Eras/python/Era_Run2_2017_new_cff.py new file mode 100644 index 0000000000000..08f13aa9ab0f5 --- /dev/null +++ b/Configuration/Eras/python/Era_Run2_2017_new_cff.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +from Configuration.Eras.Era_Run2_2017_cff import Run2_2017 +from Configuration.Eras.Modifier_phase1PixelNewFPix_cff import phase1PixelNewFPix +from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 + +Run2_2017_new = cms.ModifierChain(Run2_2017, phase1PixelNewFPix, run2_HF_2017, run2_HCAL_2017) + diff --git a/Configuration/Geometry/python/GeometryExtended2017newReco_cff.py b/Configuration/Geometry/python/GeometryExtended2017newReco_cff.py new file mode 100644 index 0000000000000..96492d3ffa253 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2017newReco_cff.py @@ -0,0 +1,33 @@ +import FWCore.ParameterSet.Config as cms + +# Ideal geometry, needed for transient ECAL alignement +from Configuration.Geometry.GeometryExtended2017new_cff import * + + +# Reconstruction geometry services +# Tracking Geometry +#bah - well, this is not a cfi! +from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import * + +#Tracker +from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * + +#Muon +from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * +from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * + +# Alignment +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * +from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * +from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * +trackerGeometry.applyAlignment = False + +# Calorimeters +from Geometry.CaloEventSetup.CaloTopology_cfi import * +from Geometry.CaloEventSetup.CaloGeometry_cff import * +from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * +from Geometry.EcalMapping.EcalMapping_cfi import * +from Geometry.EcalMapping.EcalMappingRecord_cfi import * +from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * +from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2017new_cff.py b/Configuration/Geometry/python/GeometryExtended2017new_cff.py new file mode 100644 index 0000000000000..319b024d7b539 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtended2017new_cff.py @@ -0,0 +1,11 @@ +import FWCore.ParameterSet.Config as cms + +# +# Geometry master configuration +# +# Ideal geometry, needed for simulation +from Geometry.CMSCommonData.cmsExtendedGeometry2017newXML_cfi import * +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * +from Geometry.HcalCommonData.hcalParameters_cfi import * +from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * + diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 963dd6ca668fd..591f76d740308 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -9,6 +9,7 @@ '2017PU', '2017NewFPix', '2017HCALdev', + '2017AllNew', ] upgradeKeys[2023] = [ @@ -74,6 +75,12 @@ 'Era' : 'Run2_2017_HCALdev', 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], }, + '2017AllNew' : { + 'Geom' : 'Extended2017new', + 'GT' : 'auto:phase1_2017_hcaldev', + 'Era' : 'Run2_2017_new', + 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], + }, } upgradeProperties[2017]['2017PU'] = deepcopy(upgradeProperties[2017]['2017']) diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 341777aaaaa82..d92c20ceba58a 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -18,6 +18,7 @@ def __init__(self): 'Run2_2017', 'Run2_2017_NewFPix', 'Run2_2017_HCALdev', + 'Run2_2017_new', 'Run2_2017_trackingRun2', 'Run2_2017_trackingPhase1PU70', 'Run3', diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index 8df3821ca7462..0b5ccb29f72c0 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -23,6 +23,7 @@ 'Extended2016' : 'Extended2016,Extended2016Reco', 'Extended2017' : 'Extended2017,Extended2017Reco', 'Extended2017dev': 'Extended2017dev,Extended2017devReco', + 'Extended2017new': 'Extended2017new,Extended2017newReco', 'Extended2019' : 'Extended2019,Extended2019Reco', 'ExtendedGFlash' : 'ExtendedGFlash,ExtendedGFlashReco', 'All' : 'Configuration.Geometry.GeometrySimAll_cff,Reco', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2017newXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017newXML_cfi.py new file mode 100644 index 0000000000000..b1fcf8f0a73eb --- /dev/null +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2017newXML_cfi.py @@ -0,0 +1,285 @@ +import FWCore.ParameterSet.Config as cms + +## 2015 + new phase 1 pixel detector + +XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", + geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/CMSCommonData/data/extend/cmsextent.xml', + 'Geometry/CMSCommonData/data/PhaseI/cms.xml', + 'Geometry/CMSCommonData/data/cmsMother.xml', + 'Geometry/CMSCommonData/data/eta3/etaMax.xml', + 'Geometry/CMSCommonData/data/cmsTracker.xml', + 'Geometry/CMSCommonData/data/caloBase.xml', + 'Geometry/CMSCommonData/data/cmsCalo.xml', + 'Geometry/CMSCommonData/data/muonBase.xml', + 'Geometry/CMSCommonData/data/cmsMuon.xml', + 'Geometry/CMSCommonData/data/mgnt.xml', + 'Geometry/CMSCommonData/data/PhaseI/beampipe.xml', + 'Geometry/CMSCommonData/data/cmsBeam.xml', + 'Geometry/CMSCommonData/data/muonMB.xml', + 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/CMSCommonData/data/cavern.xml', + 'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdMaterials.xml', + 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdCylinder.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdDisks.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdSupportRingParameters.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdInnerDiskZplus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdInnerDiskZminus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdOuterDiskZplus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdOuterDiskZminus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeInnerZplus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeInnerZminus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeOuterZplus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeOuterZminus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbar.xml', + 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmodpar.xml', + 'Geometry/TrackerCommonData/data/tibmodule0.xml', + 'Geometry/TrackerCommonData/data/tibmodule0a.xml', + 'Geometry/TrackerCommonData/data/tibmodule0b.xml', + 'Geometry/TrackerCommonData/data/tibmodule2.xml', + 'Geometry/TrackerCommonData/data/tibstringpar.xml', + 'Geometry/TrackerCommonData/data/tibstring0ll.xml', + 'Geometry/TrackerCommonData/data/tibstring0lr.xml', + 'Geometry/TrackerCommonData/data/tibstring0ul.xml', + 'Geometry/TrackerCommonData/data/tibstring0ur.xml', + 'Geometry/TrackerCommonData/data/tibstring0.xml', + 'Geometry/TrackerCommonData/data/tibstring1ll.xml', + 'Geometry/TrackerCommonData/data/tibstring1lr.xml', + 'Geometry/TrackerCommonData/data/tibstring1ul.xml', + 'Geometry/TrackerCommonData/data/tibstring1ur.xml', + 'Geometry/TrackerCommonData/data/tibstring1.xml', + 'Geometry/TrackerCommonData/data/tibstring2ll.xml', + 'Geometry/TrackerCommonData/data/tibstring2lr.xml', + 'Geometry/TrackerCommonData/data/tibstring2ul.xml', + 'Geometry/TrackerCommonData/data/tibstring2ur.xml', + 'Geometry/TrackerCommonData/data/tibstring2.xml', + 'Geometry/TrackerCommonData/data/tibstring3ll.xml', + 'Geometry/TrackerCommonData/data/tibstring3lr.xml', + 'Geometry/TrackerCommonData/data/tibstring3ul.xml', + 'Geometry/TrackerCommonData/data/tibstring3ur.xml', + 'Geometry/TrackerCommonData/data/tibstring3.xml', + 'Geometry/TrackerCommonData/data/tiblayerpar.xml', + 'Geometry/TrackerCommonData/data/tiblayer0.xml', + 'Geometry/TrackerCommonData/data/tiblayer1.xml', + 'Geometry/TrackerCommonData/data/tiblayer2.xml', + 'Geometry/TrackerCommonData/data/tiblayer3.xml', + 'Geometry/TrackerCommonData/data/tib.xml', + 'Geometry/TrackerCommonData/data/tidmaterial.xml', + 'Geometry/TrackerCommonData/data/tidmodpar.xml', + 'Geometry/TrackerCommonData/data/tidmodule0.xml', + 'Geometry/TrackerCommonData/data/tidmodule0r.xml', + 'Geometry/TrackerCommonData/data/tidmodule0l.xml', + 'Geometry/TrackerCommonData/data/tidmodule1.xml', + 'Geometry/TrackerCommonData/data/tidmodule1r.xml', + 'Geometry/TrackerCommonData/data/tidmodule1l.xml', + 'Geometry/TrackerCommonData/data/tidmodule2.xml', + 'Geometry/TrackerCommonData/data/tidringpar.xml', + 'Geometry/TrackerCommonData/data/tidring0.xml', + 'Geometry/TrackerCommonData/data/tidring0f.xml', + 'Geometry/TrackerCommonData/data/tidring0b.xml', + 'Geometry/TrackerCommonData/data/tidring1.xml', + 'Geometry/TrackerCommonData/data/tidring1f.xml', + 'Geometry/TrackerCommonData/data/tidring1b.xml', + 'Geometry/TrackerCommonData/data/tidring2.xml', + 'Geometry/TrackerCommonData/data/tid.xml', + 'Geometry/TrackerCommonData/data/tidf.xml', + 'Geometry/TrackerCommonData/data/tidb.xml', + 'Geometry/TrackerCommonData/data/tibtidservices.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesf.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesb.xml', + 'Geometry/TrackerCommonData/data/tobmaterial.xml', + 'Geometry/TrackerCommonData/data/tobmodpar.xml', + 'Geometry/TrackerCommonData/data/tobmodule0.xml', + 'Geometry/TrackerCommonData/data/tobmodule2.xml', + 'Geometry/TrackerCommonData/data/tobmodule4.xml', + 'Geometry/TrackerCommonData/data/tobrodpar.xml', + 'Geometry/TrackerCommonData/data/tobrod0c.xml', + 'Geometry/TrackerCommonData/data/tobrod0l.xml', + 'Geometry/TrackerCommonData/data/tobrod0h.xml', + 'Geometry/TrackerCommonData/data/tobrod0.xml', + 'Geometry/TrackerCommonData/data/tobrod1l.xml', + 'Geometry/TrackerCommonData/data/tobrod1h.xml', + 'Geometry/TrackerCommonData/data/tobrod1.xml', + 'Geometry/TrackerCommonData/data/tobrod2c.xml', + 'Geometry/TrackerCommonData/data/tobrod2l.xml', + 'Geometry/TrackerCommonData/data/tobrod2h.xml', + 'Geometry/TrackerCommonData/data/tobrod2.xml', + 'Geometry/TrackerCommonData/data/tobrod3l.xml', + 'Geometry/TrackerCommonData/data/tobrod3h.xml', + 'Geometry/TrackerCommonData/data/tobrod3.xml', + 'Geometry/TrackerCommonData/data/tobrod4c.xml', + 'Geometry/TrackerCommonData/data/tobrod4l.xml', + 'Geometry/TrackerCommonData/data/tobrod4h.xml', + 'Geometry/TrackerCommonData/data/tobrod4.xml', + 'Geometry/TrackerCommonData/data/tobrod5l.xml', + 'Geometry/TrackerCommonData/data/tobrod5h.xml', + 'Geometry/TrackerCommonData/data/tobrod5.xml', + 'Geometry/TrackerCommonData/data/tob.xml', + 'Geometry/TrackerCommonData/data/tecmaterial.xml', + 'Geometry/TrackerCommonData/data/tecmodpar.xml', + 'Geometry/TrackerCommonData/data/tecmodule0.xml', + 'Geometry/TrackerCommonData/data/tecmodule0r.xml', + 'Geometry/TrackerCommonData/data/tecmodule0s.xml', + 'Geometry/TrackerCommonData/data/tecmodule1.xml', + 'Geometry/TrackerCommonData/data/tecmodule1r.xml', + 'Geometry/TrackerCommonData/data/tecmodule1s.xml', + 'Geometry/TrackerCommonData/data/tecmodule2.xml', + 'Geometry/TrackerCommonData/data/tecmodule3.xml', + 'Geometry/TrackerCommonData/data/tecmodule4.xml', + 'Geometry/TrackerCommonData/data/tecmodule4r.xml', + 'Geometry/TrackerCommonData/data/tecmodule4s.xml', + 'Geometry/TrackerCommonData/data/tecmodule5.xml', + 'Geometry/TrackerCommonData/data/tecmodule6.xml', + 'Geometry/TrackerCommonData/data/tecpetpar.xml', + 'Geometry/TrackerCommonData/data/tecring0.xml', + 'Geometry/TrackerCommonData/data/tecring1.xml', + 'Geometry/TrackerCommonData/data/tecring2.xml', + 'Geometry/TrackerCommonData/data/tecring3.xml', + 'Geometry/TrackerCommonData/data/tecring4.xml', + 'Geometry/TrackerCommonData/data/tecring5.xml', + 'Geometry/TrackerCommonData/data/tecring6.xml', + 'Geometry/TrackerCommonData/data/tecring0f.xml', + 'Geometry/TrackerCommonData/data/tecring1f.xml', + 'Geometry/TrackerCommonData/data/tecring2f.xml', + 'Geometry/TrackerCommonData/data/tecring3f.xml', + 'Geometry/TrackerCommonData/data/tecring4f.xml', + 'Geometry/TrackerCommonData/data/tecring5f.xml', + 'Geometry/TrackerCommonData/data/tecring6f.xml', + 'Geometry/TrackerCommonData/data/tecring0b.xml', + 'Geometry/TrackerCommonData/data/tecring1b.xml', + 'Geometry/TrackerCommonData/data/tecring2b.xml', + 'Geometry/TrackerCommonData/data/tecring3b.xml', + 'Geometry/TrackerCommonData/data/tecring4b.xml', + 'Geometry/TrackerCommonData/data/tecring5b.xml', + 'Geometry/TrackerCommonData/data/tecring6b.xml', + 'Geometry/TrackerCommonData/data/tecpetalf.xml', + 'Geometry/TrackerCommonData/data/tecpetalb.xml', + 'Geometry/TrackerCommonData/data/tecpetal0.xml', + 'Geometry/TrackerCommonData/data/tecpetal0f.xml', + 'Geometry/TrackerCommonData/data/tecpetal0b.xml', + 'Geometry/TrackerCommonData/data/tecpetal3.xml', + 'Geometry/TrackerCommonData/data/tecpetal3f.xml', + 'Geometry/TrackerCommonData/data/tecpetal3b.xml', + 'Geometry/TrackerCommonData/data/tecpetal6f.xml', + 'Geometry/TrackerCommonData/data/tecpetal6b.xml', + 'Geometry/TrackerCommonData/data/tecpetal8f.xml', + 'Geometry/TrackerCommonData/data/tecpetal8b.xml', + 'Geometry/TrackerCommonData/data/tecwheel.xml', + 'Geometry/TrackerCommonData/data/tecwheela.xml', + 'Geometry/TrackerCommonData/data/tecwheelb.xml', + 'Geometry/TrackerCommonData/data/tecwheelc.xml', + 'Geometry/TrackerCommonData/data/tecwheeld.xml', + 'Geometry/TrackerCommonData/data/tecwheel6.xml', + 'Geometry/TrackerCommonData/data/tecservices.xml', + 'Geometry/TrackerCommonData/data/tecbackplate.xml', + 'Geometry/TrackerCommonData/data/tec.xml', + 'Geometry/TrackerCommonData/data/trackermaterial.xml', + 'Geometry/TrackerCommonData/data/tracker.xml', + 'Geometry/TrackerCommonData/data/trackerpixbar.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/trackerpixfwd.xml', + 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', + 'Geometry/TrackerCommonData/data/trackertib.xml', + 'Geometry/TrackerCommonData/data/trackertid.xml', + 'Geometry/TrackerCommonData/data/trackertob.xml', + 'Geometry/TrackerCommonData/data/trackertec.xml', + 'Geometry/TrackerCommonData/data/trackerbulkhead.xml', + 'Geometry/TrackerCommonData/data/trackerother.xml', + 'Geometry/EcalCommonData/data/eregalgo.xml', + 'Geometry/EcalCommonData/data/ebalgo.xml', + 'Geometry/EcalCommonData/data/ebcon.xml', + 'Geometry/EcalCommonData/data/ebrot.xml', + 'Geometry/EcalCommonData/data/eecon.xml', + 'Geometry/EcalCommonData/data/eefixed.xml', + 'Geometry/EcalCommonData/data/eehier.xml', + 'Geometry/EcalCommonData/data/eealgo.xml', + 'Geometry/EcalCommonData/data/escon.xml', + 'Geometry/EcalCommonData/data/esalgo.xml', + 'Geometry/EcalCommonData/data/eeF.xml', + 'Geometry/EcalCommonData/data/eeB.xml', + 'Geometry/EcalCommonData/data/ectkcable.xml', + 'Geometry/HcalCommonData/data/hcalrotations.xml', + 'Geometry/HcalCommonData/data/PhaseI/hcalalgo.xml', + 'Geometry/HcalCommonData/data/hcalcablealgo.xml', + 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + 'Geometry/HcalCommonData/data/PhaseI/hcalendcapalgo.xml', + 'Geometry/HcalCommonData/data/hcalouteralgo.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + 'Geometry/HcalCommonData/data/Run2/hcalSimNumbering17.xml', + 'Geometry/HcalCommonData/data/Run2/hcalRecNumbering17.xml', + 'Geometry/MuonCommonData/data/v1/mbCommon.xml', + 'Geometry/MuonCommonData/data/v1/mb1.xml', + 'Geometry/MuonCommonData/data/v1/mb2.xml', + 'Geometry/MuonCommonData/data/v1/mb3.xml', + 'Geometry/MuonCommonData/data/v1/mb4.xml', + 'Geometry/MuonCommonData/data/design/muonYoke.xml', + 'Geometry/MuonCommonData/data/v2/mf.xml', + 'Geometry/MuonCommonData/data/v2/rpcf.xml', + 'Geometry/MuonCommonData/data/v2/csc.xml', + 'Geometry/MuonCommonData/data/v2/mfshield.xml', + 'Geometry/ForwardCommonData/data/forward.xml', + 'Geometry/ForwardCommonData/data/v2/forwardshield.xml', + 'Geometry/ForwardCommonData/data/brmrotations.xml', + 'Geometry/ForwardCommonData/data/brm.xml', + 'Geometry/ForwardCommonData/data/totemMaterials.xml', + 'Geometry/ForwardCommonData/data/totemRotations.xml', + 'Geometry/ForwardCommonData/data/totemt1.xml', + 'Geometry/ForwardCommonData/data/totemt2.xml', + 'Geometry/ForwardCommonData/data/ionpump.xml', + 'Geometry/ForwardCommonData/data/castor.xml', + 'Geometry/ForwardCommonData/data/zdcmaterials.xml', + 'Geometry/ForwardCommonData/data/lumimaterials.xml', + 'Geometry/ForwardCommonData/data/zdcrotations.xml', + 'Geometry/ForwardCommonData/data/lumirotations.xml', + 'Geometry/ForwardCommonData/data/zdc.xml', + 'Geometry/ForwardCommonData/data/zdclumi.xml', + 'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring( + 'Geometry/MuonCommonData/data/v2/muonNumbering.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd/trackerStructureTopology.xml', + 'Geometry/TrackerSimData/data/PhaseI/pixfwd/trackersens.xml', + 'Geometry/TrackerRecoData/data/PhaseI/pixfwd/trackerRecoMaterial.xml', + 'Geometry/EcalSimData/data/ecalsens.xml', + 'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml', + 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hfpmt.xml', + 'Geometry/HcalSimData/data/hffibrebundle.xml', + 'Geometry/HcalSimData/data/CaloUtil.xml', + 'Geometry/MuonSimData/data/muonSens.xml', + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', + 'Geometry/ForwardCommonData/data/brmsens.xml', + 'Geometry/ForwardSimData/data/castorsens.xml', + 'Geometry/ForwardSimData/data/zdcsens.xml', + 'Geometry/HcalSimData/data/HcalProdCuts.xml', + 'Geometry/EcalSimData/data/EcalProdCuts.xml', + 'Geometry/EcalSimData/data/ESProdCuts.xml', + 'Geometry/TrackerSimData/data/PhaseI/pixfwd/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', + 'Geometry/MuonSimData/data/muonProdCuts.xml', + 'Geometry/ForwardSimData/data/CastorProdCuts.xml', + 'Geometry/ForwardSimData/data/zdcProdCuts.xml', + 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', + 'Geometry/CMSCommonData/data/FieldParameters.xml'), + rootNodeName = cms.string('cms:OCMS') +) + + From 833fe0e4ed9dd6dc52b083741ac6eed9cac37f73 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Thu, 22 Sep 2016 10:16:24 -0500 Subject: [PATCH 17/18] add 2017 new WF to short matrix --- Configuration/PyReleaseValidation/python/relval_2017.py | 4 ++-- Configuration/PyReleaseValidation/scripts/runTheMatrix.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index 4fda343853078..d8a625be63c91 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -15,8 +15,8 @@ numWFStart=10000 numWFSkip=200 -#2017 WFs to run in IB (TenMuE_0_200, TTbar, ZEE, MinBias, TTbar PU, ZEE PU,TTbar NewPIX,TTbar HCALdev) -numWFIB = [10021.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0,10624.0] +#2017 WFs to run in IB (TenMuE_0_200, TTbar, ZEE, MinBias, TTbar PU, ZEE PU,TTbar NewPIX,TTbar HCALdev,TTbar 2017new) +numWFIB = [10021.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0,10624.0,10824.0] for i,key in enumerate(upgradeKeys[2017]): numWF=numWFStart+i*numWFSkip for frag in upgradeFragments: diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 0829f5984a09a..02b66da54426e 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -61,6 +61,7 @@ def runSelected(opt): 10024.0, #2017 ttbar 10424.0, #2017 NewPix ttbar 10624.0, #2017 HCALdev ttbar + 10824.0, #2017 all new ttbar 20024.0, #2023D1 ttbar (Run2 calo) 20824.0, #2023D3 ttbar (HGCal) ], From 21e6fece76ea19b1fd6f52182b77c65a2292fcc9 Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Thu, 22 Sep 2016 12:00:21 -0500 Subject: [PATCH 18/18] turn off HBHEChannelInfo --- RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py | 1 - 1 file changed, 1 deletion(-) diff --git a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py index 88483ffe7a84c..18eae50ee349a 100644 --- a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py +++ b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py @@ -31,4 +31,3 @@ eras.run2_HF_2017.toReplaceWith( hcalLocalRecoSequence, _phase1_hcalLocalRecoSequence ) eras.run2_HF_2017.toReplaceWith( hfreco, _phase1_hfreco ) eras.run2_HE_2017.toReplaceWith( hbheprereco, _phase1_hbheprereco ) -eras.run2_HE_2017.toModify( hbheprereco, saveInfos = cms.bool(True) )