From d3cc6472553e5e1926cee30c361e9d27ba7aa3cb Mon Sep 17 00:00:00 2001 From: Efe Yigitbasi Date: Tue, 4 Jun 2024 15:06:25 +0200 Subject: [PATCH 1/2] Adding OMTF and GEM unpackers to L1REPACK:FullSimTP and some cleaning. Modified the config to use unpacked muon TF inputs instead of re-emulated muon TPs. --- .../SimL1EmulatorRepack_FullSimTP_cff.py | 72 +++++++++++++------ 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py index ac763f93af934..7d7df8af405b9 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py @@ -15,18 +15,13 @@ unpackBmtf = EventFilter.L1TRawToDigi.bmtfDigis_cfi.bmtfDigis.clone( InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())) -import EventFilter.DTTFRawToDigi.dttfunpacker_cfi -unpackDttf = EventFilter.DTTFRawToDigi.dttfunpacker_cfi.dttfunpacker.clone( - DTTF_FED_Source = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())) +import EventFilter.L1TRawToDigi.omtfStage2Digis_cfi +unpackOmtf = EventFilter.L1TRawToDigi.omtfStage2Digis_cfi.omtfStage2Digis.clone( + inputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())) import EventFilter.L1TRawToDigi.emtfStage2Digis_cfi unpackEmtf = EventFilter.L1TRawToDigi.emtfStage2Digis_cfi.emtfStage2Digis.clone( InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())) - - -import EventFilter.CSCTFRawToDigi.csctfunpacker_cfi -unpackCsctf = EventFilter.CSCTFRawToDigi.csctfunpacker_cfi.csctfunpacker.clone( - producer = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())) import EventFilter.CSCRawToDigi.cscUnpacker_cfi unpackCSC = EventFilter.CSCRawToDigi.cscUnpacker_cfi.muonCSCDigis.clone( @@ -40,6 +35,10 @@ unpackRPC = EventFilter.RPCRawToDigi.rpcUnpacker_cfi.rpcunpacker.clone( InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())) +import EventFilter.GEMRawToDigi.muonGEMDigis_cfi +unpackGEM = EventFilter.GEMRawToDigi.muonGEMDigis_cfi.muonGEMDigis.clone( + InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())) + import EventFilter.EcalRawToDigi.EcalUnpackerData_cfi unpackEcal = EventFilter.EcalRawToDigi.EcalUnpackerData_cfi.ecalEBunpacker.clone( InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess())) @@ -71,28 +70,55 @@ simCscTriggerPrimitiveDigis.CSCComparatorDigiProducer = 'unpackCSC:MuonCSCComparatorDigi' simCscTriggerPrimitiveDigis.CSCWireDigiProducer = 'unpackCSC:MuonCSCWireDigi' +# GEM-CSC +simMuonGEMPadDigis.InputCollection = "unpackGEM" + +# TwinMux simTwinMuxDigis.RPC_Source = 'unpackRPC' -# simTwinMuxDigis.DTDigi_Source = "simDtTriggerPrimitiveDigis" # DEFAULT -# simTwinMuxDigis.DTThetaDigi_Source = "simDtTriggerPrimitiveDigis" # DEFAULT +simTwinMuxDigis.DTDigi_Source = "simDtTriggerPrimitiveDigis" # DEFAULT +simTwinMuxDigis.DTThetaDigi_Source = "simDtTriggerPrimitiveDigis" # DEFAULT # BMTF -# simBmtfDigis.DTDigi_Source = "simTwinMuxDigis" # DEFAULT -# simBmtfDigis.DTDigi_Theta_Source = "simDtTriggerPrimitiveDigis" # DEFAULT +# simBmtfDigis.DTDigi_Source = "simTwinMuxDigis" # DEFAULT, use re-emulated TPs +# simBmtfDigis.DTDigi_Theta_Source = "simTwinMuxDigis" # DEFAULT, use re-emulated TPs + +simBmtfDigis.DTDigi_Source = "unpackBmtf" # use unpacked TF inputs +simBmtfDigis.DTDigi_Theta_Source = "unpackBmtf" # use unpacked TF inputs + +# KBMTF +# simKBmtfStubs.srcPhi = "simTwinMuxDigis" # DEFAULT, use re-emulated TPs +# simKBmtfStubs.srcTheta = "simDtTriggerPrimitiveDigis" # DEFAULT, use re-emulated TPs + +simKBmtfStubs.srcPhi = "unpackBmtf" # use unpacked TF inputs +simKBmtfStubs.srcTheta = "unpackBmtf" # use unpacked TF inputs + +simKBmtfDigis.src = "simKBmtfStubs" # DEFAULT, use re-emulated Stubs # OMTF -simOmtfDigis.srcRPC = 'unpackRPC' -# simOmtfDigis.srcDTPh = "simDtTriggerPrimitiveDigis" # DEFAULT -# simOmtfDigis.srcDTTh = "simDtTriggerPrimitiveDigis" # DEFAULT -simOmtfDigis.srcCSC = "unpackCsctf" -# simOmtfDigis.srcCSC = "simCscTriggerPrimitiveDigis" # DEFAULT +# simOmtfDigis.srcRPC = 'unpackRPC' # we don't re-emulate RPCs in data +# simOmtfDigis.srcDTPh = "simDtTriggerPrimitiveDigis" # DEFAULT, use re-emulated TPs +# simOmtfDigis.srcDTTh = "simDtTriggerPrimitiveDigis" # DEFAULT, use re-emulated TPs +# simOmtfDigis.srcCSC = "simCscTriggerPrimitiveDigis" # DEFAULT, use re-emulated TPs + +simOmtfDigis.srcRPC = 'unpackOmtf' # use unpacked TF inputs +simOmtfDigis.srcDTPh = "unpackOmtf" # use unpacked TF inputs +simOmtfDigis.srcDTTh = "unpackOmtf" # use unpacked TF inputs +simOmtfDigis.srcCSC = "unpackOmtf" # use unpacked TF inputs # EMTF -simEmtfDigis.CSCInput = "unpackEmtf" -# simEmtfDigis.CSCInput = "simCscTriggerPrimitiveDigis" # DEFAULT -simEmtfDigis.RPCInput = 'unpackRPC' +# simEmtfDigis.CSCInput = "simCscTriggerPrimitiveDigis" # DEFAULT, use re-emulated TPs +# simEmtfDigis.GEMInput = "simMuonGEMPadDigiClusters" # DEFAULT, use re-emulated TPs +# simEmtfDigis.RPCInput = 'unpackRPC' # we don't re-emulate RPCs in data + +simEmtfDigis.CSCInput = "unpackEmtf" # use unpacked TF inputs +simEmtfDigis.RPCInput = 'unpackEmtf' # use unpacked TF inputs +simEmtfDigis.GEMInput = 'unpackEmtf' # use unpacked TF inputs +simEmtfDigis.CPPFInput = 'unpackEmtf' # use unpacked TF inputs +simEmtfDigis.CPPFEnable = True # we use CPPF inputs in data -# simCaloStage2Layer1Digis.ecalToken = 'simEcalTriggerPrimitiveDigis' # DEFAULT -# simCaloStage2Layer1Digis.hcalToken = 'simHcalTriggerPrimitiveDigis' # DEFAULT +# Calo Layer-1 +simCaloStage2Layer1Digis.ecalToken = 'simEcalTriggerPrimitiveDigis' # DEFAULT +simCaloStage2Layer1Digis.hcalToken = 'simHcalTriggerPrimitiveDigis' # DEFAULT # Finally, pack the new L1T output back into RAW @@ -114,7 +140,7 @@ SimL1EmulatorTask = cms.Task() -stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackEcal,unpackHcal,unpackCSC,unpackDT,unpackRPC,unpackEmtf,unpackCsctf,unpackBmtf +stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackEcal,unpackHcal,unpackCSC,unpackDT,unpackRPC,unpackGEM,unpackEmtf,unpackBmtf,unpackOmtf ,simEcalTriggerPrimitiveDigis ,simHcalTriggerPrimitiveDigis ,SimL1EmulatorCoreTask,packCaloStage2 From 65e01a673639a82f78c17ef1b58bea0ea395aa2f Mon Sep 17 00:00:00 2001 From: Efe Yigitbasi Date: Tue, 4 Jun 2024 16:11:20 +0200 Subject: [PATCH 2/2] Move unpackGEM to run3_GEM modifier instead of stage2L1Trigger --- .../python/SimL1EmulatorRepack_FullSimTP_cff.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py index 7d7df8af405b9..6853c631973ae 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py @@ -4,6 +4,7 @@ ## L1REPACK FullSimTP : Re-Emulate all of L1 and repack into RAW from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM (~stage2L1Trigger).toModify(None, lambda x: print("# L1T WARN: L1REPACK:FullSimTP (intended for data) only supports Stage-2 eras for now.\n# L1T WARN: Use a legacy version of L1REPACK for now.")) @@ -140,9 +141,14 @@ SimL1EmulatorTask = cms.Task() -stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackEcal,unpackHcal,unpackCSC,unpackDT,unpackRPC,unpackGEM,unpackEmtf,unpackBmtf,unpackOmtf +stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackEcal,unpackHcal,unpackCSC,unpackDT,unpackRPC,unpackEmtf,unpackBmtf,unpackOmtf ,simEcalTriggerPrimitiveDigis ,simHcalTriggerPrimitiveDigis ,SimL1EmulatorCoreTask,packCaloStage2 ,packGmtStage2,packGtStage2,rawDataCollector)) + +_SimL1EmulatorTaskWithGEM = SimL1EmulatorTask.copy() +_SimL1EmulatorTaskWithGEM.add(unpackGEM) +(stage2L1Trigger & run3_GEM).toReplaceWith(SimL1EmulatorTask, _SimL1EmulatorTaskWithGEM) + SimL1Emulator = cms.Sequence(SimL1EmulatorTask)