Merge pull request #15889 from kpedro88/Phase1-WF1

HCAL 2017 Phase1 Workflows
cms-sw · Sep 23, 2016 · 831786b · 831786b
2 parents f0a1f43 + 21e6fec
commit 831786b
Show file tree

Hide file tree

Showing 22 changed files with 454 additions and 12 deletions.
diff --git a/Configuration/Eras/python/Era_Run2_2017_HCALdev_cff.py 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,12 +1,25 @@
 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"),
     ZDC = cms.untracked.InputTag("simHcalUnsuppressedDigis"),
     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
@@ -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")) )