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..e1519987d4c7d --- /dev/null +++ b/Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py @@ -0,0 +1,8 @@ +import FWCore.ParameterSet.Config as cms + +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_2017, run2_HF_2017, run2_HCAL_2017) + 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/Eras/python/Modifier_run2_HCAL_2017_cff.py b/Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py new file mode 100644 index 0000000000000..dc68eb3f43b24 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run2_HCAL_2017_cff.py @@ -0,0 +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 new file mode 100644 index 0000000000000..0e00bac2f5241 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run2_HF_2017_cff.py @@ -0,0 +1,6 @@ +import FWCore.ParameterSet.Config as cms + +# This modifier is for HF-specific changes for sim, reco, etc. + +run2_HF_2017 = cms.Modifier() + 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/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index fc3c09ca1356d..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) -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,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/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index f297eb37758e3..591f76d740308 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -7,7 +7,9 @@ upgradeKeys[2017] = [ '2017', '2017PU', - '2017NewFPix' + '2017NewFPix', + '2017HCALdev', + '2017AllNew', ] upgradeKeys[2023] = [ @@ -66,7 +68,19 @@ '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'], + }, + '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/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 3b0ff8dc640d2..02b66da54426e 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -60,6 +60,8 @@ def runSelected(opt): 10021.0, #2017 tenmu 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) ], 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/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index e615670f33974..d92c20ceba58a 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -17,6 +17,8 @@ def __init__(self): 'Run2_2016_trackingLowPU', 'Run2_2017', 'Run2_2017_NewFPix', + 'Run2_2017_HCALdev', + 'Run2_2017_new', 'Run2_2017_trackingRun2', 'Run2_2017_trackingPhase1PU70', 'Run3', @@ -29,6 +31,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', diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index c527581afc18a..0b5ccb29f72c0 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -22,6 +22,8 @@ 'Extended2015dev': 'Extended2015dev,Extended2015devReco', '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/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py b/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py index b67000b6525a3..335ea09716bc6 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(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 6f61ce7ba72e8..6f8cf378747ae 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(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 17d20f4df2c1d..22d5c042c2e65 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(0,digiPhase1Task) + +from Configuration.StandardSequences.Eras import eras +eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) 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")) ) 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') +) + + diff --git a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py index 4d1ceca6a7a6b..18eae50ee349a 100644 --- a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py +++ b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py @@ -20,3 +20,14 @@ 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(0,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 ) 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, 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) )