Migrate DigiToRaw to Tasks

Configuration/StandardSequences/python/DigiToRawDM_cff.py

@@ -32,7 +32,7 @@
 (~premix_stage2).toModify(dtpacker, digiColl = 'mixData')
 (~premix_stage2).toModify(rpcpacker, InputLabel = "mixData")
 
-DigiToRaw.remove(castorRawData)
+DigiToRawTask.remove(castorRawData)
 
 #castorRawData.CASTOR = cms.untracked.InputTag("castorDigis")
 #

Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py

@@ -48,7 +48,11 @@
 ## Repacked DigiToRaw Sequence
 ##
 
-DigiToRawRepack = cms.Sequence( SiStripDigiToZSRaw * rawDataRepacker )
-DigiToHybridRawRepack = cms.Sequence( SiStripDigiToHybridRaw * hybridRawDataRepacker )
-DigiToVirginRawRepack = cms.Sequence( SiStripRawDigiToVirginRaw * virginRawDataRepacker )
-DigiToSplitRawRepack = cms.Sequence( DigiToRawRepack + DigiToVirginRawRepack )
+DigiToRawRepackTask = cms.Task(SiStripDigiToZSRaw, rawDataRepacker)
+DigiToHybridRawRepackTask = cms.Task(SiStripDigiToHybridRaw, hybridRawDataRepacker)
+DigiToVirginRawRepackTask = cms.Task(SiStripRawDigiToVirginRaw, virginRawDataRepacker)
+
+DigiToRawRepack = cms.Sequence( DigiToRawRepackTask )
+DigiToHybridRawRepack = cms.Sequence( DigiToHybridRawRepackTask )
+DigiToVirginRawRepack = cms.Sequence( DigiToVirginRawRepackTask )
+DigiToSplitRawRepack = cms.Sequence( DigiToRawRepackTask, DigiToVirginRawRepackTask )

Configuration/StandardSequences/python/DigiToRaw_cff.py

@@ -18,8 +18,8 @@
 from EventFilter.RawDataCollector.rawDataCollector_cfi import *
 from L1Trigger.Configuration.L1TDigiToRaw_cff import *
 
-#DigiToRaw = cms.Sequence(L1TDigiToRaw*siPixelRawData*SiStripDigiToRaw*ecalPacker*esDigiToRaw*hcalRawData*cscpacker*dtpacker*rpcpacker*rawDataCollector)
-DigiToRaw = cms.Sequence(L1TDigiToRaw*siPixelRawData*SiStripDigiToRaw*ecalPacker*esDigiToRaw*hcalRawData*cscpacker*dtpacker*rpcpacker*castorRawData*rawDataCollector)
+DigiToRawTask = cms.Task(L1TDigiToRawTask, siPixelRawData, SiStripDigiToRaw, ecalPacker, esDigiToRaw, hcalRawDataTask, cscpacker, dtpacker, rpcpacker, castorRawData, rawDataCollector)
+DigiToRaw = cms.Sequence(DigiToRawTask)
 
 ecalPacker.Label = 'simEcalDigis'
 ecalPacker.InstanceEB = 'ebDigis'
@@ -28,28 +28,28 @@
 ecalPacker.labelEESRFlags = "simEcalDigis:eeSrFlags"
 
 from Configuration.Eras.Modifier_run3_common_cff import run3_common
-run3_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData]))
+run3_common.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([castorRawData]))
 
 #if we don't have hcal raw data
 from Configuration.Eras.Modifier_hcalSkipPacker_cff import hcalSkipPacker
-hcalSkipPacker.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([hcalRawData]))
+hcalSkipPacker.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([hcalRawDataTask]))
 
 # Remove siPixelRawData until we have phase1 pixel digis
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
-phase2_tracker.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([siPixelRawData])) # FIXME
+phase2_tracker.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([siPixelRawData])) # FIXME
 
 # GEM settings
-_gem_DigiToRaw = DigiToRaw.copy()
-_gem_DigiToRaw.insert(-2,gemPacker)
+_gem_DigiToRawTask = DigiToRawTask.copy()
+_gem_DigiToRawTask.add(gemPacker)
 
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
-run2_GEM_2017.toReplaceWith(DigiToRaw, _gem_DigiToRaw)
+run2_GEM_2017.toReplaceWith(DigiToRawTask, _gem_DigiToRawTask)
 
 from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
-run3_GEM.toReplaceWith(DigiToRaw, _gem_DigiToRaw)
+run3_GEM.toReplaceWith(DigiToRawTask, _gem_DigiToRawTask)
 
 from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
-phase2_muon.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([rpcpacker]))
+phase2_muon.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([rpcpacker]))
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
-fastSim.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([siPixelRawData,SiStripDigiToRaw,castorRawData]))
+fastSim.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([siPixelRawData,SiStripDigiToRaw,castorRawData]))

EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py

@@ -9,17 +9,18 @@
     TRIG =  cms.untracked.InputTag("simHcalTriggerPrimitiveDigis")
 )
 
-hcalRawData = cms.Sequence(hcalRawDataVME)
+hcalRawDataTask = cms.Task(hcalRawDataVME)
+hcalRawData = cms.Sequence(hcalRawDataTask)
 
 from EventFilter.HcalRawToDigi.hcalDigiToRawuHTR_cfi import hcalDigiToRawuHTR as hcalRawDatauHTR
 
-_phase1_hcalRawData = hcalRawData.copy()
-_phase1_hcalRawData += hcalRawDatauHTR
+_phase1_hcalRawDataTask = hcalRawDataTask.copy()
+_phase1_hcalRawDataTask.add(hcalRawDatauHTR)
 
 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
 run2_HCAL_2017.toModify( hcalRawDataVME,
     HBHE = cms.untracked.InputTag(""),
     HF = cms.untracked.InputTag(""),
     TRIG = cms.untracked.InputTag("")
 )
-run2_HCAL_2017.toReplaceWith(hcalRawData,_phase1_hcalRawData)
+run2_HCAL_2017.toReplaceWith(hcalRawDataTask,_phase1_hcalRawDataTask)

EventFilter/L1TRawToDigi/python/caloLayer1Raw_cfi.py

@@ -17,4 +17,4 @@
 caloLayer1RawFed1358 = caloLayer1RawFed1354.clone()
 caloLayer1RawFed1358.FedId = 1358
 
-caloLayer1Raw = cms.Sequence(caloLayer1RawFed1354 + caloLayer1RawFed1356 + caloLayer1RawFed1358)
+caloLayer1Raw = cms.Task(caloLayer1RawFed1354, caloLayer1RawFed1356, caloLayer1RawFed1358)

EventFilter/L1TRawToDigi/test/test_CaloLayer1.py

@@ -104,8 +104,8 @@
 # Path and EndPath definitions
 process.path = cms.Path(
     process.caloLayer1Digis *
-    process.caloLayer1Raw *
-    process.collectPackers
+    process.collectPackers,
+    process.caloLayer1Raw
 )
 
 process.out = cms.EndPath(

L1Trigger/Configuration/python/L1TDigiToRaw_cff.py

@@ -37,7 +37,7 @@
 l1GtPack.DaqGtInputTag = 'simGtDigis'
 l1GtPack.MuGmtInputTag = 'simGmtDigis'
 l1GtEvmPack.EvmGtInputTag = 'simGtDigis'
-L1TDigiToRaw = cms.Sequence(csctfpacker+dttfpacker+gctDigiToRaw+l1GtPack+l1GtEvmPack)
+L1TDigiToRawTask = cms.Task(csctfpacker, dttfpacker, gctDigiToRaw, l1GtPack, l1GtEvmPack)
 
 #
 # Stage-1 Trigger
@@ -47,7 +47,7 @@
 # (but still needed for RCT digis!)
 (stage1L1Trigger & ~stage2L1Trigger).toModify(gctDigiToRaw, gctInputLabel = 'simCaloStage1LegacyFormatDigis')
 from EventFilter.L1TRawToDigi.caloStage1Raw_cfi import *
-(stage1L1Trigger & ~stage2L1Trigger).toReplaceWith(L1TDigiToRaw, cms.Sequence(csctfpacker+dttfpacker+l1GtPack+caloStage1Raw))
+(stage1L1Trigger & ~stage2L1Trigger).toReplaceWith(L1TDigiToRawTask, cms.Task(csctfpacker, dttfpacker, l1GtPack, caloStage1Raw))
 
 #
 # Stage-2 Trigger
@@ -59,4 +59,6 @@
 from EventFilter.L1TRawToDigi.gmtStage2Raw_cfi import *
 from EventFilter.L1TRawToDigi.gtStage2Raw_cfi import *
 # Missing: muon EMTF
-(stage2L1Trigger).toReplaceWith(L1TDigiToRaw, cms.Sequence(caloLayer1Raw + caloStage2Raw + bmtfStage2Raw + omtfStage2Raw + gmtStage2Raw + gtStage2Raw))
+(stage2L1Trigger).toReplaceWith(L1TDigiToRawTask, cms.Task(caloLayer1Raw, caloStage2Raw, bmtfStage2Raw, omtfStage2Raw, gmtStage2Raw, gtStage2Raw))
+
+L1TDigiToRaw = cms.Sequence(L1TDigiToRawTask)