remove castor from phase2 sequences

cms-sw · Sep 5, 2016 · fdc181f · fdc181f
1 parent 9ec38d9
commit fdc181f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 1 deletion.
diff --git a/Configuration/StandardSequences/python/DigiToRaw_cff.py b/Configuration/StandardSequences/python/DigiToRaw_cff.py
@@ -25,6 +25,7 @@
 ecalPacker.labelEBSRFlags = "simEcalDigis:ebSrFlags"
 ecalPacker.labelEESRFlags = "simEcalDigis:eeSrFlags"
 
+eras.phase2_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData]))
 
 #until we have hcal raw data for phase 2....
 eras.phase2_hcal.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([hcalRawData]))

diff --git a/Configuration/StandardSequences/python/RawToDigi_cff.py b/Configuration/StandardSequences/python/RawToDigi_cff.py
@@ -79,6 +79,8 @@
 totemTriggerRawToDigi.rawDataTag = cms.InputTag("rawDataCollector")
 totemRPRawToDigi.rawDataTag = cms.InputTag("rawDataCollector")
 
+eras.phase2_common.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([castorDigis]))
+
 # until we have hcal raw data for phase 2...
 eras.phase2_hcal.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([hcalDigis]))
 

diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py
@@ -50,6 +50,11 @@
 localreco = cms.Sequence(bunchSpacingProducer+trackerlocalreco+muonlocalreco+calolocalreco+castorreco)
 localreco_HcalNZS = cms.Sequence(trackerlocalreco+muonlocalreco+calolocalrecoNZS+castorreco)
 
+_phase2_localreco = localreco.copyAndExclude([castorreco])
+_phase2_localreco_HcalNZS = localreco_HcalNZS.copyAndExclude([castorreco])
+eras.phase2_common.toReplaceWith(localreco, _phase2_localreco)
+eras.phase2_common.toReplaceWith(localreco_HcalNZS, _phase2_localreco_HcalNZS)
+
 _ctpps_2016_localreco = localreco.copy()
 _ctpps_2016_localreco += totemRPLocalReconstruction
 eras.ctpps_2016.toReplaceWith(localreco, _ctpps_2016_localreco)
@@ -89,6 +94,9 @@
                           muoncosmicreco*
                           CastorFullReco)
 
+_phase2_globalreco = globalreco.copyAndExclude([CastorFullReco])
+eras.phase2_common.toReplaceWith(globalreco, _phase2_globalreco)
+
 globalreco_plusPL= cms.Sequence(globalreco*ctfTracksPixelLess)
 
 reducedRecHits = cms.Sequence ( reducedEcalRecHitsSequence * reducedHcalRecHitsSequence )

diff --git a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py
@@ -47,3 +47,6 @@
     del simCastorDigis
     del simSiPixelDigis
     del simSiStripDigis
+
+if eras.phase2_common.isChosen():
+    del simCastorDigis
diff --git a/SimGeneral/MixingModule/python/aliases_cfi.py b/SimGeneral/MixingModule/python/aliases_cfi.py
@@ -44,3 +44,5 @@
     del simSiPixelDigis
     del simSiStripDigis
 
+if eras.phase2_common.isChosen():
+    del simCastorDigis
diff --git a/SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py b/SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py
@@ -35,6 +35,8 @@
     # fastsim does not digitize pixel and strip hits
     delattr(theDigitizersMixPreMix,"pixel")
     delattr(theDigitizersMixPreMix,"strip")
+
+eras.phase2_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
@@ -51,7 +51,7 @@
                             hgchefrontDigitizer = cms.PSet(hgchefrontDigitizer),
 )
 
-
+eras.phase2_common.toModify( theDigitizers, castor = None )
 
 theDigitizersValid = cms.PSet(
     theDigitizers,