put castor removal in run3_common

cms-sw · Jul 31, 2017 · 0b1663f · 0b1663f
1 parent e3803b7
commit 0b1663f
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 25 deletions.
diff --git a/Configuration/Eras/python/Era_Phase2_cff.py b/Configuration/Eras/python/Era_Phase2_cff.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.Modifier_run2_common_cff import run2_common
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
 from Configuration.Eras.Modifier_phase2_ecal_cff import phase2_ecal
@@ -17,7 +18,7 @@
 from Configuration.Eras.Modifier_hcalHardcodeConditions_cff import hcalHardcodeConditions
 from Configuration.Eras.Modifier_hcalSkipPacker_cff import hcalSkipPacker
 
-Phase2 = cms.ModifierChain(run2_common, phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal,
+Phase2 = cms.ModifierChain(run2_common, run3_common, phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal,
     run2_HE_2017, run2_HF_2017, run2_HCAL_2017, run3_HB, phase2_hcal, phase2_hgcal, phase2_muon, run3_GEM, stage2L1Trigger,
     hcalHardcodeConditions, hcalSkipPacker,
 )
diff --git a/Configuration/Geometry/python/dict2023Geometry.py b/Configuration/Geometry/python/dict2023Geometry.py
@@ -29,7 +29,7 @@
         5 : [
             'Geometry/CMSCommonData/data/FieldParameters.xml',
         ],
-        "era" : "run2_common, phase2_common",
+        "era" : "run2_common, run3_common, phase2_common",
     }    
 }
 

diff --git a/Configuration/StandardSequences/python/DigiToRawPreMixing_cff.py b/Configuration/StandardSequences/python/DigiToRawPreMixing_cff.py
@@ -25,8 +25,8 @@
 ecalPacker.labelEESRFlags = "simEcalDigis:eeSrFlags"
 hcalRawDatauHTR.premix = cms.bool(True)
 
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData]))
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData]))
 
 #until we have hcal raw data for phase 2....
 from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal

diff --git a/Configuration/StandardSequences/python/DigiToRaw_cff.py b/Configuration/StandardSequences/python/DigiToRaw_cff.py
@@ -24,8 +24,8 @@
 ecalPacker.labelEBSRFlags = "simEcalDigis:ebSrFlags"
 ecalPacker.labelEESRFlags = "simEcalDigis:eeSrFlags"
 
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData]))
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData]))
 
 #if we don't have hcal raw data
 from Configuration.Eras.Modifier_hcalSkipPacker_cff import hcalSkipPacker

diff --git a/Configuration/StandardSequences/python/RawToDigi_cff.py b/Configuration/StandardSequences/python/RawToDigi_cff.py
@@ -76,8 +76,8 @@
 muonRPCDigis.InputLabel = 'rawDataCollector'
 castorDigis.InputLabel = 'rawDataCollector'
 
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([castorDigis]))
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([castorDigis]))
 
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
 # Remove siPixelDigis until we have phase1 pixel digis

diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py
@@ -50,16 +50,16 @@
 localreco = cms.Sequence(bunchSpacingProducer+trackerlocalreco+muonlocalreco+calolocalreco+castorreco)
 localreco_HcalNZS = cms.Sequence(bunchSpacingProducer+trackerlocalreco+muonlocalreco+calolocalrecoNZS+castorreco)
 
-_phase2_localreco = localreco.copyAndExclude([castorreco])
-_phase2_localreco_HcalNZS = localreco_HcalNZS.copyAndExclude([castorreco])
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toReplaceWith(localreco, _phase2_localreco)
-phase2_common.toReplaceWith(localreco_HcalNZS, _phase2_localreco_HcalNZS)
+_run3_localreco = localreco.copyAndExclude([castorreco])
+_run3_localreco_HcalNZS = localreco_HcalNZS.copyAndExclude([castorreco])
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toReplaceWith(localreco, _run3_localreco)
+run3_common.toReplaceWith(localreco_HcalNZS, _run3_localreco_HcalNZS)
 
 from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
-_phase2_timing_layer_localreco = _phase2_localreco.copy()
+_phase2_timing_layer_localreco = _run3_localreco.copy()
 _phase2_timing_layer_localreco += fastTimingLocalReco
-_phase2_timing_layer_localreco_HcalNZS = localreco_HcalNZS.copyAndExclude([castorreco])
+_phase2_timing_layer_localreco_HcalNZS = _run3_localreco_HcalNZS.copy()
 _phase2_timing_layer_localreco_HcalNZS += fastTimingLocalReco
 phase2_timing_layer.toReplaceWith(localreco,_phase2_timing_layer_localreco)
 phase2_timing_layer.toReplaceWith(localreco_HcalNZS,_phase2_timing_layer_localreco_HcalNZS)
@@ -103,8 +103,8 @@
                           muoncosmicreco*
                           CastorFullReco)
 
-_phase2_globalreco = globalreco.copyAndExclude([CastorFullReco])
-phase2_common.toReplaceWith(globalreco, _phase2_globalreco)
+_run3_globalreco = globalreco.copyAndExclude([CastorFullReco])
+run3_common.toReplaceWith(globalreco, _run3_globalreco)
 
 globalreco_plusPL= cms.Sequence(globalreco*ctfTracksPixelLess)
 

diff --git a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py
@@ -46,5 +46,5 @@
 fastSim.toModify(simSiPixelDigis, mix = None)
 fastSim.toModify(simSiStripDigis, mix = None)
 
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toModify(simCastorDigis, mix = None)
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(simCastorDigis, mix = None)
diff --git a/SimGeneral/MixingModule/python/aliases_cfi.py b/SimGeneral/MixingModule/python/aliases_cfi.py
@@ -42,5 +42,5 @@
 fastSim.toModify(simSiPixelDigis, mix = None)
 fastSim.toModify(simSiStripDigis, mix = None)
 
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toModify(simCastorDigis, mix = None)
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(simCastorDigis, mix = None)
diff --git a/SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py b/SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py
@@ -36,8 +36,8 @@
     delattr(theDigitizersMixPreMix,"pixel")
     delattr(theDigitizersMixPreMix,"strip")
 
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toModify( theDigitizersMixPreMix, castor = None )
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify( theDigitizersMixPreMix, castor = None )
 
 theDigitizersMixPreMixValid = cms.PSet(
     theDigitizersMixPreMix,

diff --git a/SimGeneral/MixingModule/python/digitizers_cfi.py b/SimGeneral/MixingModule/python/digitizers_cfi.py
@@ -52,8 +52,8 @@
                             hgchefrontDigitizer = cms.PSet(hgchefrontDigitizer),
 )
 
-from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toModify( theDigitizers, castor = None )
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify( theDigitizers, castor = None )
 
 from SimGeneral.MixingModule.ecalTimeDigitizer_cfi import ecalTimeDigitizer
 from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ @@
 : [
                 'Geometry/CMSCommonData/data/FieldParameters.xml',
             ],
-            "era" : "run2_common, phase2_common",
+            "era" : "run2_common, run3_common, phase2_common",
         }
     }
@@ Expand Down @@