From bb52bb043c6670b722749d710ad247befccb67b4 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 5 Aug 2021 12:35:15 +0200 Subject: [PATCH 1/6] add GEM unpacker in L1REPACK and update hltGetConfig --- .../python/SimL1EmulatorRepack_FullMC_cff.py | 8 ++++++++ .../Configuration/python/customizeHLTforCMSSW.py | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py index a24d0ece093f6..15273b80f2c2f 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py @@ -25,6 +25,10 @@ def _print(ignored): unpackCSC = EventFilter.CSCRawToDigi.cscUnpacker_cfi.muonCSCDigis.clone( InputObjects = 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())) @@ -84,6 +88,9 @@ def _print(ignored): simCaloStage2Layer1Digis.ecalToken = 'unpackEcal:EcalTriggerPrimitives' simCaloStage2Layer1Digis.hcalToken = 'simHcalTriggerPrimitiveDigis' +# GEM +simMuonGEMPadDigis.InputCollection = 'unpackGEM' + # Finally, pack the new L1T output back into RAW from EventFilter.L1TRawToDigi.caloStage2Raw_cfi import caloStage2Raw as packCaloStage2 from EventFilter.L1TRawToDigi.gmtStage2Raw_cfi import gmtStage2Raw as packGmtStage2 @@ -105,6 +112,7 @@ def _print(ignored): stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackRPC , unpackDT , unpackCSC + , unpackGEM , unpackEcal , unpackHcal #, simEcalTriggerPrimitiveDigis diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 2abc5cce7e82c..e49b8db266a52 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -129,10 +129,23 @@ def customiseFor2018Input(process): return process +#temporary solution to add GEM geometry for hltGetConfiguration +def customiseForRun3GEMGeometry34788(process): + """Add GEM geometry to output from hltGetConfiguration""" + process.GEMGeometryESModule = cms.ESProducer( + "GEMGeometryESModule", + fromDD4Hep = cms.bool( False ), + appendToDataLabel = cms.string( "" ), + fromDDD = cms.bool( False ) + ) + # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) + + if menuType in ["GRun","HIon","PIon","PRef"]: + process = customiseForRun3GEMGeometry34788(process) return process From eebc1ec459328032c25f9f3633297de9039e50ea Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 12 Aug 2021 14:51:07 +0200 Subject: [PATCH 2/6] fix GEM producer for dd4hep wf --- HLTrigger/Configuration/python/customizeHLTforCMSSW.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index e49b8db266a52..43449fb2a2201 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -132,7 +132,7 @@ def customiseFor2018Input(process): #temporary solution to add GEM geometry for hltGetConfiguration def customiseForRun3GEMGeometry34788(process): """Add GEM geometry to output from hltGetConfiguration""" - process.GEMGeometryESModule = cms.ESProducer( + process.gemGeometry = cms.ESProducer( "GEMGeometryESModule", fromDD4Hep = cms.bool( False ), appendToDataLabel = cms.string( "" ), From e96a0354c9051d56b8fe5550d79d9d967cfbeb26 Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sat, 4 Sep 2021 10:34:52 +0200 Subject: [PATCH 3/6] rebase and edit config --- HLTrigger/Configuration/python/customizeHLTforCMSSW.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 43449fb2a2201..6dbc44482dfe7 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -132,12 +132,9 @@ def customiseFor2018Input(process): #temporary solution to add GEM geometry for hltGetConfiguration def customiseForRun3GEMGeometry34788(process): """Add GEM geometry to output from hltGetConfiguration""" - process.gemGeometry = cms.ESProducer( - "GEMGeometryESModule", - fromDD4Hep = cms.bool( False ), - appendToDataLabel = cms.string( "" ), - fromDDD = cms.bool( False ) - ) + process.load("Geometry.GEMGeometryBuilder.gemGeometryDB_cfi") + + return process # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): From 96a960dc7f28582f030422ac2896949a9176fe4c Mon Sep 17 00:00:00 2001 From: Norraphat Date: Sat, 4 Sep 2021 14:51:18 +0200 Subject: [PATCH 4/6] update for dd4hep --- HLTrigger/Configuration/python/customizeHLTforCMSSW.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index 6dbc44482dfe7..e503e0dedd7ae 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -133,16 +133,17 @@ def customiseFor2018Input(process): def customiseForRun3GEMGeometry34788(process): """Add GEM geometry to output from hltGetConfiguration""" process.load("Geometry.GEMGeometryBuilder.gemGeometryDB_cfi") - - return process + # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) - + + # GEM + from Configuration.ProcessModifiers.dd4hep_cff import dd4hep if menuType in ["GRun","HIon","PIon","PRef"]: - process = customiseForRun3GEMGeometry34788(process) + addCustomiseForRun3GEMGeometry34788_ = (~dd4hep).makeProcessModifier( customiseForRun3GEMGeometry34788 ) return process From 47b90a65634ea8d73888bcff942d345ed7311d1f Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 16 Sep 2021 01:45:31 +0200 Subject: [PATCH 5/6] code clean up --- .../Configuration/python/customizeHLTforCMSSW.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index e503e0dedd7ae..a2c831b0ef480 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -3,6 +3,9 @@ # helper fuctions from HLTrigger.Configuration.common import * +# dd4hep +from Configuration.ProcessModifiers.dd4hep_cff import dd4hep + # add one customisation function per PR # - put the PR number into the name of the function # - add a short comment @@ -130,10 +133,11 @@ def customiseFor2018Input(process): #temporary solution to add GEM geometry for hltGetConfiguration -def customiseForRun3GEMGeometry34788(process): +def customiseFor34788(process): """Add GEM geometry to output from hltGetConfiguration""" process.load("Geometry.GEMGeometryBuilder.gemGeometryDB_cfi") + return process # CMSSW version specific customizations def customizeHLTforCMSSW(process, menuType="GRun"): @@ -141,9 +145,8 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # add call to action function in proper order: newest last! # process = customiseFor12718(process) - # GEM - from Configuration.ProcessModifiers.dd4hep_cff import dd4hep + # temporary for GEM if menuType in ["GRun","HIon","PIon","PRef"]: - addCustomiseForRun3GEMGeometry34788_ = (~dd4hep).makeProcessModifier( customiseForRun3GEMGeometry34788 ) + (~dd4hep).makeProcessModifier(customiseFor34788) return process From 6c2bedf226190849fde788be259f9f0c0619732e Mon Sep 17 00:00:00 2001 From: Norraphat Date: Thu, 16 Sep 2021 03:09:42 +0200 Subject: [PATCH 6/6] add apply(process) --- HLTrigger/Configuration/python/customizeHLTforCMSSW.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py index a2c831b0ef480..a05620f102484 100644 --- a/HLTrigger/Configuration/python/customizeHLTforCMSSW.py +++ b/HLTrigger/Configuration/python/customizeHLTforCMSSW.py @@ -147,6 +147,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"): # temporary for GEM if menuType in ["GRun","HIon","PIon","PRef"]: - (~dd4hep).makeProcessModifier(customiseFor34788) + (~dd4hep).makeProcessModifier(customiseFor34788).apply(process) return process