Last active
May 27, 2020 12:49
-
-
Save mmusich/a624f1fc84291dd0466314ed271e6994 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Configuration/StandardSequences/python/DigiToRaw_cff.py b/Configuration/StandardSequences/python/DigiToRaw_cff.py | |
index 0df921bc98e..9d9a48f5869 100644 | |
--- a/Configuration/StandardSequences/python/DigiToRaw_cff.py | |
+++ b/Configuration/StandardSequences/python/DigiToRaw_cff.py | |
@@ -34,9 +34,10 @@ run3_common.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([castorRaw | |
from Configuration.Eras.Modifier_hcalSkipPacker_cff import hcalSkipPacker | |
hcalSkipPacker.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([hcalRawDataTask])) | |
-# Remove siPixelRawData until we have phase1 pixel digis | |
+# Remove siPixelRawData until we have phase2 pixel digis | |
+# No Strip detector in Phase-2 Tracker | |
from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker | |
-phase2_tracker.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([siPixelRawData])) # FIXME | |
+phase2_tracker.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([siPixelRawData,SiStripDigiToRaw])) # FIXME | |
# GEM settings | |
_gem_DigiToRawTask = DigiToRawTask.copy() | |
diff --git a/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py b/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py | |
index 173d1eca02c..17e2e1e438c 100644 | |
--- a/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py | |
+++ b/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py | |
@@ -34,3 +34,7 @@ run2_GEM_2017.toModify( rawDataCollector.RawCollectionList, func = lambda list: | |
from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM | |
run3_GEM.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("gemPacker")) ) | |
+ | |
+# Phase-2 Tracker | |
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker | |
+phase2_tracker.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.remove(cms.InputTag("SiStripDigiToRaw")) ) | |
diff --git a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py | |
index 9e305fb988f..64017b8a6ea 100644 | |
--- a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py | |
+++ b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py | |
@@ -66,6 +66,7 @@ from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel | |
phase1Pixel.toModify(simSiPixelDigis, mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))]) | |
from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker | |
+phase2_tracker.toModify(simSiStripDigis, mix = None) | |
phase2_tracker.toModify(simAPVsaturation, mixData = None) | |
# no castor,pixel,strip digis in fastsim | |
diff --git a/SimGeneral/MixingModule/python/aliases_cfi.py b/SimGeneral/MixingModule/python/aliases_cfi.py | |
index ab7507921b5..f3ce553183e 100644 | |
--- a/SimGeneral/MixingModule/python/aliases_cfi.py | |
+++ b/SimGeneral/MixingModule/python/aliases_cfi.py | |
@@ -92,6 +92,10 @@ from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose | |
from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel | |
phase1Pixel.toModify(simSiPixelDigis, mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))]) | |
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker | |
+phase2_tracker.toModify(simSiStripDigis, mix = None) | |
+phase2_tracker.toModify(simAPVsaturation, mix = None) | |
+ | |
# no castor,pixel,strip digis in fastsim | |
from Configuration.Eras.Modifier_fastSim_cff import fastSim | |
fastSim.toModify(simCastorDigis, mix = None) | |
diff --git a/SimGeneral/MixingModule/python/digitizers_cfi.py b/SimGeneral/MixingModule/python/digitizers_cfi.py | |
index 247acfe7a04..86823f0cdaf 100644 | |
--- a/SimGeneral/MixingModule/python/digitizers_cfi.py | |
+++ b/SimGeneral/MixingModule/python/digitizers_cfi.py | |
@@ -99,6 +99,10 @@ premix_stage2.toModify(theDigitizers, | |
) | |
) | |
+from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker | |
+phase2_tracker.toModify(theDigitizers, | |
+ strip = None) | |
+ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment