From a128c088c4d97b9af6afbd4186ab248a93620ec1 Mon Sep 17 00:00:00 2001 From: sesen Date: Mon, 24 Oct 2022 15:36:25 +0200 Subject: [PATCH 1/5] fix tests --- AllenOnline/tests/options/cpu_decoding.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/AllenOnline/tests/options/cpu_decoding.py b/AllenOnline/tests/options/cpu_decoding.py index df7e7317b..d4c407585 100644 --- a/AllenOnline/tests/options/cpu_decoding.py +++ b/AllenOnline/tests/options/cpu_decoding.py @@ -13,7 +13,7 @@ from Moore.config import Reconstruction, get_allen_hlt1_decision_ids from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_options from RecoConf.calorimeter_reconstruction import make_ecal_digits from RecoConf.hlt1_muonid import make_muon_hits -from PyConf.application import default_raw_event, configured_ann_svc +from PyConf.application import default_raw_event, default_raw_banks, configured_ann_svc from PyConf.Algorithms import HltSelReportsDecoder, HltDecReportsDecoder from Configurables import ApplicationMgr from RecoConf.hlt1_tracking import (make_VeloClusterTrackingSIMD_hits, @@ -43,7 +43,8 @@ mgr.ExtSvc += [configured_ann_svc('TCKANNSvc')] def decoding(): - ecal_raw = default_raw_event(["EcalPacked"]) + ecal_raw = default_raw_banks("EcalPacked", default_raw_event) + ecal_raw_error = default_raw_banks("EcalPackedError", default_raw_event) decoders = [ loc.producer for loc in [ @@ -51,7 +52,7 @@ def decoding(): make_PrStorePrUTHits_hits(), make_PrStoreSciFiHits_hits(), make_rich_pixels(default_rich_reco_options())['RichDecodedData'], - make_ecal_digits(ecal_raw), + make_ecal_digits(ecal_raw, ecal_raw_error), make_muon_hits(), make_decreports(), make_selreports() -- GitLab From 08478f39d7f38a8e80f3ae864bd5ac6c0f66253b Mon Sep 17 00:00:00 2001 From: sesen Date: Mon, 31 Oct 2022 14:31:50 +0100 Subject: [PATCH 2/5] fix hlt dec reports decoding --- AllenOnline/tests/options/check_duplicates.py | 6 +++--- AllenOnline/tests/options/cpu_decoding.py | 17 ++++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/AllenOnline/tests/options/check_duplicates.py b/AllenOnline/tests/options/check_duplicates.py index 1c2f1c5fd..692877302 100644 --- a/AllenOnline/tests/options/check_duplicates.py +++ b/AllenOnline/tests/options/check_duplicates.py @@ -56,11 +56,11 @@ check_seq = GaudiSequencer("CheckODINSeq") unpack_raw = UnpackRawEvent( RawEventLocation='DAQ/RawEvent', - RawBankLocations=['DAQ/RawBanks/ODIN'], - BankTypes=['ODIN']) + RawBankLocations=['DAQ/RawBanks/ODIN','DAQ/RawBanks/HltDecReports'], + BankTypes=['ODIN', 'HltDecReports']) dec_reports = HltDecReportsDecoder( - RawEventLocations='DAQ/RawEvent', + RawBanks='DAQ/RawBanks/HltDecReports', SourceID='Hlt1', DecoderMapping="TCKANNSvc", OutputHltDecReportsLocation='Hlt1/DecReports') diff --git a/AllenOnline/tests/options/cpu_decoding.py b/AllenOnline/tests/options/cpu_decoding.py index d4c407585..0423fc310 100644 --- a/AllenOnline/tests/options/cpu_decoding.py +++ b/AllenOnline/tests/options/cpu_decoding.py @@ -14,7 +14,7 @@ from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_opt from RecoConf.calorimeter_reconstruction import make_ecal_digits from RecoConf.hlt1_muonid import make_muon_hits from PyConf.application import default_raw_event, default_raw_banks, configured_ann_svc -from PyConf.Algorithms import HltSelReportsDecoder, HltDecReportsDecoder +from PyConf.Algorithms import HltSelReportsDecoder, HltDecReportsDecoder, LHCb__UnpackRawEvent from Configurables import ApplicationMgr from RecoConf.hlt1_tracking import (make_VeloClusterTrackingSIMD_hits, make_PrStoreSciFiHits_hits, @@ -22,17 +22,24 @@ from RecoConf.hlt1_tracking import (make_VeloClusterTrackingSIMD_hits, def make_selreports(): + unpack_raw = LHCb__UnpackRawEvent( + RawEventLocation = default_raw_event( [ bank_type ], options.input_raw_format), + RawBankLocations=['DAQ/RawBanks/HltSelReports'], + BankTypes=['HltSelReports']) return HltSelReportsDecoder( - RawEventLocations=default_raw_event(["HltDecReports"], - options.input_raw_format), + RawEventLocations=unpack_raw.RawBankLocations[0], SourceID='Hlt1', DecoderMapping="TCKANNSvc").OutputHltSelReportsLocation def make_decreports(): + unpack_raw = LHCb__UnpackRawEvent( + RawEventLocation = default_raw_event( [ bank_type ], options.input_raw_format), + RawBankLocations=['DAQ/RawBanks/HltDecReports'], + BankTypes=['HltDeReports']) + return HltDecReportsDecoder( - RawEventLocations=default_raw_event(["HltSelReports"], - options.input_raw_format), + RawEventLocations=unpack_raw.RawBankLocations[0], SourceID='Hlt1', DecoderMapping="TCKANNSvc").OutputHltDecReportsLocation -- GitLab From 16cb5829fce3f1962a34ac5d94f73427b3b36ff6 Mon Sep 17 00:00:00 2001 From: sesen Date: Fri, 4 Nov 2022 09:43:23 +0100 Subject: [PATCH 3/5] fix cpu decoding --- AllenOnline/tests/options/cpu_decoding.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/AllenOnline/tests/options/cpu_decoding.py b/AllenOnline/tests/options/cpu_decoding.py index 0423fc310..f94118b96 100644 --- a/AllenOnline/tests/options/cpu_decoding.py +++ b/AllenOnline/tests/options/cpu_decoding.py @@ -22,24 +22,16 @@ from RecoConf.hlt1_tracking import (make_VeloClusterTrackingSIMD_hits, def make_selreports(): - unpack_raw = LHCb__UnpackRawEvent( - RawEventLocation = default_raw_event( [ bank_type ], options.input_raw_format), - RawBankLocations=['DAQ/RawBanks/HltSelReports'], - BankTypes=['HltSelReports']) return HltSelReportsDecoder( - RawEventLocations=unpack_raw.RawBankLocations[0], + RawBanks=default_raw_banks("HltSelReports"), + DecReports=default_raw_banks("HltDecReports"), SourceID='Hlt1', DecoderMapping="TCKANNSvc").OutputHltSelReportsLocation def make_decreports(): - unpack_raw = LHCb__UnpackRawEvent( - RawEventLocation = default_raw_event( [ bank_type ], options.input_raw_format), - RawBankLocations=['DAQ/RawBanks/HltDecReports'], - BankTypes=['HltDeReports']) - return HltDecReportsDecoder( - RawEventLocations=unpack_raw.RawBankLocations[0], + RawBanks=default_raw_banks("HltDecReports"), SourceID='Hlt1', DecoderMapping="TCKANNSvc").OutputHltDecReportsLocation @@ -69,4 +61,5 @@ def decoding(): return Reconstruction('decoding', decoders, []) +default_raw_event.global_bind(raw_event_format=options.input_raw_format) run_reconstruction(options, decoding) -- GitLab From fafe57d4a8bf881549ccb20b994075f3f22e1bb7 Mon Sep 17 00:00:00 2001 From: sesen Date: Fri, 4 Nov 2022 09:45:14 +0100 Subject: [PATCH 4/5] fix cpu decoding --- AllenOnline/tests/options/check_duplicates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AllenOnline/tests/options/check_duplicates.py b/AllenOnline/tests/options/check_duplicates.py index 692877302..476dcd306 100644 --- a/AllenOnline/tests/options/check_duplicates.py +++ b/AllenOnline/tests/options/check_duplicates.py @@ -56,7 +56,7 @@ check_seq = GaudiSequencer("CheckODINSeq") unpack_raw = UnpackRawEvent( RawEventLocation='DAQ/RawEvent', - RawBankLocations=['DAQ/RawBanks/ODIN','DAQ/RawBanks/HltDecReports'], + RawBankLocations=['DAQ/RawBanks/ODIN', 'DAQ/RawBanks/HltDecReports'], BankTypes=['ODIN', 'HltDecReports']) dec_reports = HltDecReportsDecoder( -- GitLab From 035295ae55811f864d13c2457146085140eeaa58 Mon Sep 17 00:00:00 2001 From: sesen Date: Fri, 4 Nov 2022 20:05:41 +0100 Subject: [PATCH 5/5] fix lumi test --- AllenOnline/tests/options/cpu_decoding.py | 2 +- .../tests/options/test_allen_lumisummaries.py | 26 ++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/AllenOnline/tests/options/cpu_decoding.py b/AllenOnline/tests/options/cpu_decoding.py index f94118b96..c4de85266 100644 --- a/AllenOnline/tests/options/cpu_decoding.py +++ b/AllenOnline/tests/options/cpu_decoding.py @@ -61,5 +61,5 @@ def decoding(): return Reconstruction('decoding', decoders, []) -default_raw_event.global_bind(raw_event_format=options.input_raw_format) +default_raw_event.global_bind(raw_event_format=0.5) run_reconstruction(options, decoding) diff --git a/AllenOnline/tests/options/test_allen_lumisummaries.py b/AllenOnline/tests/options/test_allen_lumisummaries.py index a040633ee..1d08a2f67 100755 --- a/AllenOnline/tests/options/test_allen_lumisummaries.py +++ b/AllenOnline/tests/options/test_allen_lumisummaries.py @@ -22,6 +22,7 @@ import argparse import json NEW_RAW_EVENT_LOC = "DAQ/NewRawEvent" +NEW_RAW_BANK_LOC = "DAQ/NewRawBanks/HltLumiSummary" NEW_LUMI_SUMMARY_LOC = "Hlt/NewLumiSummary" defaultFile = "mep_lumi.mdf" @@ -51,8 +52,8 @@ from Configurables import OdinTypesFilter unpack_raw = UnpackRawEvent( RawEventLocation='DAQ/RawEvent', - RawBankLocations=['DAQ/RawBanks/ODIN'], - BankTypes=['ODIN']) + RawBankLocations=['DAQ/RawBanks/ODIN', 'DAQ/RawBanks/HltLumiSummary'], + BankTypes=['ODIN', 'HltLumiSummary']) createODIN = createODIN() seq.Members = [unpack_raw, createODIN] @@ -60,13 +61,20 @@ odinFilter = OdinTypesFilter('OdinTypesFilter', TriggerTypes=['LumiTrigger']) seq.Members.append(odinFilter) #Decode, re-encode and re-decode -seq.Members.append("HltLumiSummaryDecoder") -seq.Members.append(HltLumiWriter(RawEventLocation=NEW_RAW_EVENT_LOC)) -seq.Members.append( - HltLumiSummaryDecoder( - name="HltLumiSummaryReDecoder", - RawEventLocations=NEW_RAW_EVENT_LOC, - OutputContainerName=NEW_LUMI_SUMMARY_LOC)) +decoder = HltLumiSummaryDecoder(RawBanks=unpack_raw.RawBankLocations[1]) + +writer = HltLumiWriter( + InputBank=decoder.OutputContainerName, + OutputBank=NEW_RAW_BANK_LOC, + RawEventLocation=NEW_RAW_EVENT_LOC) +redecoder = HltLumiSummaryDecoder( + name="HltLumiSummaryReDecoder", + RawBanks=writer.OutputBank, + OutputContainerName=NEW_LUMI_SUMMARY_LOC) + +seq.Members.append(decoder) +seq.Members.append(writer) +seq.Members.append(redecoder) app = ApplicationMgr(TopAlg=[seq]) -- GitLab