Merge pull request #14180 from lgray/fix_hgcal_unit_test

Update HGCal unit test to run with flat phase 2 tracker
cms-sw · Apr 29, 2016 · 2b57736 · 2b57736
2 parents 1d52eaa + ef9010d
commit 2b57736
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
@@ -61,7 +61,7 @@ def __init__(self):
         # Scenarios further afield.
         # Phase2 is everything for the 2023 (2026?) detector that works so far in this release.
         # include phase 1 stuff until phase 2 tracking is fully defined....
-        self.Phase2 = cms.ModifierChain( self.phase1Pixel, self.trackingPhase1, self.phase2_common, self.phase2_tracker, self.phase2_hgcal, self.phase2_muon )
+        self.Phase2 = cms.ModifierChain( self.phase2_common, self.phase2_tracker, self.phase2_hgcal, self.phase2_muon )
         # Phase2dev is everything for the 2023 (2026?) detector that is still in development.
         self.Phase2dev = cms.ModifierChain( self.Phase2, self.phase2dev_common, self.phase2dev_tracker, self.phase2dev_hgcal, self.phase2dev_muon )
 

diff --git a/RecoLocalCalo/HGCalRecProducers/test/testHGCalRecoLocal_cfg.py b/RecoLocalCalo/HGCalRecProducers/test/testHGCalRecoLocal_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("testHGCalRecoLocal",eras.Phase2,eras.phase1Pixel,eras.trackingPhase1)
+process = cms.Process("testHGCalRecoLocal",eras.Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
@@ -11,8 +11,8 @@
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Configuration.EventContent.EventContent_cff')
 process.load('SimGeneral.MixingModule.mixNoPU_cfi')
-process.load('Configuration.Geometry.GeometryExtended2023DevReco_cff')
-process.load('Configuration.Geometry.GeometryExtended2023Dev_cff')
+process.load('Configuration.Geometry.GeometryExtended2023LRecoReco_cff')
+process.load('Configuration.Geometry.GeometryExtended2023LReco_cff')
 process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
 process.load('Configuration.StandardSequences.Generator_cff')
 process.load('IOMC.EventVertexGenerators.VtxSmearedGauss_cfi')
@@ -125,4 +125,5 @@
         getattr(process,path)._seq = process.generator * getattr(process,path)._seq
 
 # customisation of the process.
-
+from SLHCUpgradeSimulations.Configuration.phase2TkFlat import customise
+process=customise(process)