Skip to content

Commit

Permalink
Synchronise with CMSSW_10_4_0_pre3
Browse files Browse the repository at this point in the history
  • Loading branch information
@fwyzard
fwyzard committed Dec 29, 2020
1 parent db96746 commit 094270a
Showing 1 changed file with 45 additions and 53 deletions.
98 changes: 45 additions & 53 deletions Configuration/StandardSequences/python/RawToDigi_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,35 +48,27 @@

from EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff import *

RawToDigi = cms.Sequence(L1TRawToDigi
+siPixelDigis
+siStripDigis
+ecalDigis
+ecalPreshowerDigis
+hcalDigis
+muonCSCDigis
+muonDTDigis
+muonRPCDigis
+castorDigis
+scalersRawToDigi
+tcdsDigis
+onlineMetaDataDigis
RawToDigiTask = cms.Task(L1TRawToDigiTask,
siPixelDigis,
siStripDigis,
ecalDigis,
ecalPreshowerDigis,
hcalDigis,
muonCSCDigis,
muonDTDigis,
muonRPCDigis,
castorDigis,
scalersRawToDigi,
tcdsDigis,
onlineMetaDataDigis,
)
RawToDigi = cms.Sequence(RawToDigiTask)

RawToDigi_noTk = cms.Sequence(L1TRawToDigi
+ecalDigis
+ecalPreshowerDigis
+hcalDigis
+muonCSCDigis
+muonDTDigis
+muonRPCDigis
+castorDigis
+scalersRawToDigi
+tcdsDigis
+onlineMetaDataDigis
)

RawToDigi_pixelOnly = cms.Sequence(siPixelDigis)
RawToDigiTask_noTk = RawToDigiTask.copyAndExclude([siPixelDigis, siStripDigis])
RawToDigi_noTk = cms.Sequence(RawToDigiTask_noTk)

RawToDigiTask_pixelOnly = cms.Task(siPixelDigis)
RawToDigi_pixelOnly = cms.Sequence(RawToDigiTask_pixelOnly)

scalersRawToDigi.scalersInputTag = 'rawDataCollector'
from Configuration.ProcessModifiers.gpu_cff import gpu
Expand All @@ -91,56 +83,56 @@
castorDigis.InputLabel = 'rawDataCollector'

from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([castorDigis]))
run3_common.toReplaceWith(RawToDigiTask, RawToDigiTask.copyAndExclude([castorDigis]))

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
# Remove siPixelDigis until we have phase1 pixel digis
phase2_tracker.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([siPixelDigis])) # FIXME
phase2_tracker.toReplaceWith(RawToDigiTask, RawToDigiTask.copyAndExclude([siPixelDigis])) # FIXME


# add CTPPS 2016 raw-to-digi modules
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016

_ctpps_2016_RawToDigi = RawToDigi.copy()
_ctpps_2016_RawToDigi += ctppsRawToDigi
ctpps_2016.toReplaceWith(RawToDigi, _ctpps_2016_RawToDigi)
_ctpps_2016_RawToDigiTask = RawToDigiTask.copy()
_ctpps_2016_RawToDigiTask.add(ctppsRawToDigiTask)
ctpps_2016.toReplaceWith(RawToDigiTask, _ctpps_2016_RawToDigiTask)

_ctpps_2016_RawToDigi_noTk = RawToDigi_noTk.copy()
_ctpps_2016_RawToDigi_noTk += ctppsRawToDigi
ctpps_2016.toReplaceWith(RawToDigi_noTk, _ctpps_2016_RawToDigi_noTk)
_ctpps_2016_RawToDigiTask_noTk = RawToDigiTask_noTk.copy()
_ctpps_2016_RawToDigiTask_noTk.add(ctppsRawToDigiTask)
ctpps_2016.toReplaceWith(RawToDigiTask_noTk, _ctpps_2016_RawToDigiTask_noTk)

# GEM settings
_gem_RawToDigi = RawToDigi.copy()
_gem_RawToDigi.insert(-1,muonGEMDigis)
_gem_RawToDigiTask = RawToDigiTask.copy()
_gem_RawToDigiTask.add(muonGEMDigis)

from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
run2_GEM_2017.toReplaceWith(RawToDigi, _gem_RawToDigi)
run2_GEM_2017.toReplaceWith(RawToDigiTask, _gem_RawToDigiTask)

from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
run3_GEM.toReplaceWith(RawToDigi, _gem_RawToDigi)
run3_GEM.toReplaceWith(RawToDigiTask, _gem_RawToDigiTask)

from EventFilter.HGCalRawToDigi.HGCalRawToDigi_cfi import *
_hgcal_RawToDigi = RawToDigi.copy()
_hgcal_RawToDigi += hgcalDigis
_hgcal_RawToDigiTask = RawToDigiTask.copy()
_hgcal_RawToDigiTask.add(hgcalDigis)
from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toReplaceWith(RawToDigi,_hgcal_RawToDigi)
phase2_hgcal.toReplaceWith(RawToDigiTask,_hgcal_RawToDigiTask)

# RPC New Readout Validation
from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
_rpc_NewReadoutVal_RawToDigi = RawToDigi.copy()
_rpc_NewReadoutVal_RawToDigi_noTk = RawToDigi_noTk.copy()
_rpc_NewReadoutVal_RawToDigi += muonRPCNewDigis
_rpc_NewReadoutVal_RawToDigi_noTk += muonRPCNewDigis
stage2L1Trigger_2017.toReplaceWith(RawToDigi, _rpc_NewReadoutVal_RawToDigi)
stage2L1Trigger_2017.toReplaceWith(RawToDigi_noTk, _rpc_NewReadoutVal_RawToDigi)
_rpc_NewReadoutVal_RawToDigiTask = RawToDigiTask.copy()
_rpc_NewReadoutVal_RawToDigiTask_noTk = RawToDigiTask_noTk.copy()
_rpc_NewReadoutVal_RawToDigiTask.add(muonRPCNewDigis)
_rpc_NewReadoutVal_RawToDigiTask_noTk.add(muonRPCNewDigis)
stage2L1Trigger_2017.toReplaceWith(RawToDigiTask, _rpc_NewReadoutVal_RawToDigiTask)
stage2L1Trigger_2017.toReplaceWith(RawToDigiTask_noTk, _rpc_NewReadoutVal_RawToDigiTask)

from Configuration.Eras.Modifier_fastSim_cff import fastSim
fastSim.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([muonRPCNewDigis]))
fastSim.toReplaceWith(RawToDigi_noTk, RawToDigi_noTk.copyAndExclude([muonRPCNewDigis]))
fastSim.toReplaceWith(RawToDigiTask, RawToDigiTask.copyAndExclude([muonRPCNewDigis]))
fastSim.toReplaceWith(RawToDigiTask_noTk, RawToDigiTask_noTk.copyAndExclude([muonRPCNewDigis]))

_hfnose_RawToDigi = RawToDigi.copy()
_hfnose_RawToDigi += hfnoseDigis
_hfnose_RawToDigiTask = RawToDigiTask.copy()
_hfnose_RawToDigiTask.add(hfnoseDigis)

from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose
phase2_hfnose.toReplaceWith(RawToDigi,_hfnose_RawToDigi)
phase2_hfnose.toReplaceWith(RawToDigiTask,_hfnose_RawToDigiTask)

0 comments on commit 094270a

Please sign in to comment.