Skip to content
Snippets Groups Projects
Commit 66a15243 authored by Andrea Coccaro's avatar Andrea Coccaro
Browse files

Merge branch 'addL1MuonToTopo_II' into '22.0'

Adding Muon RoI Container for L1Topo AOD

See merge request !57072
parents dfde741f 51e62085
No related branches found
No related tags found
4 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!5717730.09.2022: daily merge merge of 22.0 into master,!57072Adding Muon RoI Container for L1Topo AOD
...@@ -286,8 +286,6 @@ if __name__ == '__main__': ...@@ -286,8 +286,6 @@ if __name__ == '__main__':
outputEDM += addEDM('xAOD::EmTauRoIContainer', 'LVL1EmTauRoIs') outputEDM += addEDM('xAOD::EmTauRoIContainer', 'LVL1EmTauRoIs')
outputEDM += addEDM('xAOD::EnergySumRoI' , 'LVL1EnergySumRoI') outputEDM += addEDM('xAOD::EnergySumRoI' , 'LVL1EnergySumRoI')
loadFromSG = [('xAOD::EventInfo', 'StoreGateSvc+EventInfo')]
if 'Muons' in subsystem: if 'Muons' in subsystem:
from MuonConfig.MuonBytestreamDecodeConfig import RpcBytestreamDecodeCfg,TgcBytestreamDecodeCfg from MuonConfig.MuonBytestreamDecodeConfig import RpcBytestreamDecodeCfg,TgcBytestreamDecodeCfg
rpcdecodingAcc = RpcBytestreamDecodeCfg(flags) rpcdecodingAcc = RpcBytestreamDecodeCfg(flags)
...@@ -298,6 +296,7 @@ if __name__ == '__main__': ...@@ -298,6 +296,7 @@ if __name__ == '__main__':
from TrigT1ResultByteStream.TrigT1ResultByteStreamConfig import MuonRoIByteStreamToolCfg from TrigT1ResultByteStream.TrigT1ResultByteStreamConfig import MuonRoIByteStreamToolCfg
muonRoiTool = MuonRoIByteStreamToolCfg(name="L1MuonBSDecoderTool",flags=flags,writeBS=False) muonRoiTool = MuonRoIByteStreamToolCfg(name="L1MuonBSDecoderTool",flags=flags,writeBS=False)
decoderTools += [muonRoiTool] decoderTools += [muonRoiTool]
outputEDM += addEDM('xAOD::MuonRoIContainer' , '*')
if 'jFex' in subsystem: if 'jFex' in subsystem:
from L1CaloFEXByteStream.L1CaloFEXByteStreamConfig import jFexRoiByteStreamToolCfg from L1CaloFEXByteStream.L1CaloFEXByteStreamConfig import jFexRoiByteStreamToolCfg
...@@ -326,12 +325,9 @@ if __name__ == '__main__': ...@@ -326,12 +325,9 @@ if __name__ == '__main__':
decoderAlg = CompFactory.L1TriggerByteStreamDecoderAlg(name="L1TriggerByteStreamDecoder", decoderAlg = CompFactory.L1TriggerByteStreamDecoderAlg(name="L1TriggerByteStreamDecoder",
DecoderTools=decoderTools, OutputLevel=algLogLevel) DecoderTools=decoderTools, OutputLevel=algLogLevel)
acc.addEventAlgo(decoderAlg, sequenceName='AthAlgSeq') acc.addEventAlgo(decoderAlg, sequenceName='AthAlgSeq')
acc.addEventAlgo(CompFactory.SGInputLoader(Load=loadFromSG), sequenceName="AthAlgSeq")
roib2topo = CompFactory.LVL1.RoiB2TopoInputDataCnv(name='RoiB2TopoInputDataCnv') roib2topo = CompFactory.LVL1.RoiB2TopoInputDataCnv(name='RoiB2TopoInputDataCnv')
roib2topo.OutputLevel = algLogLevel roib2topo.OutputLevel = algLogLevel
acc.addEventAlgo(roib2topo, sequenceName="AthAlgSeq") acc.addEventAlgo(roib2topo, sequenceName="AthAlgSeq")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment