From a56240824b79d48db270953e5f58ebc22d050677 Mon Sep 17 00:00:00 2001 From: sesen Date: Sat, 28 Aug 2021 10:31:14 +0200 Subject: [PATCH 1/4] fix the tests for createODIN change --- .../tests/options/hlt2_analysis/read_hlt2.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py b/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py index 8514d59..7e34ba1 100644 --- a/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py +++ b/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py @@ -20,6 +20,7 @@ from Configurables import ( ApplicationMgr, DecayTreeTuple, LHCbApp, + LHCb__UnpackRawEvent as UnpackRawEvent, createODIN, HltANNSvc, ) @@ -40,8 +41,8 @@ def get_hlt2_unpackers(is_simulation): This is a temporary measure until support for Run 3 HLT2 output is added to an LHCb application. """ - - reading_algs = ([reading.decoder()] + reading.unpackers() + [createODIN()]) + reading_algs = ([reading.decoder()] + reading.unpackers() + [UnpackRawEvent(BankTypes=['ODIN'],RawBankLocations=["DAQ/RawBanks"])] + + [createODIN()] ) if is_simulation: reading_algs = reading.mc_unpackers() + reading_algs return reading_algs @@ -146,4 +147,7 @@ LHCbApp().DDDBtag = "dddb-20171126" configure_packed_locations(LHCbApp().TupleFile.replace(".root", "") + ".tck.json") -ApplicationMgr().TopAlg = get_hlt2_unpackers(LHCbApp().Simulation) + user_algs + + + +ApplicationMgr().TopAlg = get_hlt2_unpackers(LHCbApp().Simulation) + user_algs -- GitLab From 691ab075272af888bcf3d69fc30eefe44589b511 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Sat, 28 Aug 2021 08:32:15 +0000 Subject: [PATCH 2/4] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/MooreAnalysis/-/jobs/15968850 --- .../tests/options/hlt2_analysis/read_hlt2.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py b/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py index 7e34ba1..9dec622 100644 --- a/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py +++ b/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py @@ -41,8 +41,9 @@ def get_hlt2_unpackers(is_simulation): This is a temporary measure until support for Run 3 HLT2 output is added to an LHCb application. """ - reading_algs = ([reading.decoder()] + reading.unpackers() + [UnpackRawEvent(BankTypes=['ODIN'],RawBankLocations=["DAQ/RawBanks"])] - + [createODIN()] ) + reading_algs = ([reading.decoder()] + reading.unpackers() + [ + UnpackRawEvent(BankTypes=['ODIN'], RawBankLocations=["DAQ/RawBanks"]) + ] + [createODIN()]) if is_simulation: reading_algs = reading.mc_unpackers() + reading_algs return reading_algs @@ -147,7 +148,4 @@ LHCbApp().DDDBtag = "dddb-20171126" configure_packed_locations(LHCbApp().TupleFile.replace(".root", "") + ".tck.json") - - - -ApplicationMgr().TopAlg = get_hlt2_unpackers(LHCbApp().Simulation) + user_algs +ApplicationMgr().TopAlg = get_hlt2_unpackers(LHCbApp().Simulation) + user_algs -- GitLab From 457d53c183e55319bf2f111a8e0185a6343f7175 Mon Sep 17 00:00:00 2001 From: sesen Date: Wed, 1 Sep 2021 11:49:06 +0200 Subject: [PATCH 3/4] update ODiN rawbank location --- HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py b/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py index 9dec622..098271c 100644 --- a/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py +++ b/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py @@ -42,7 +42,7 @@ def get_hlt2_unpackers(is_simulation): an LHCb application. """ reading_algs = ([reading.decoder()] + reading.unpackers() + [ - UnpackRawEvent(BankTypes=['ODIN'], RawBankLocations=["DAQ/RawBanks"]) + UnpackRawEvent(BankTypes=['ODIN'], RawBankLocations=["DAQ/RawBanks/ODIN"]) ] + [createODIN()]) if is_simulation: reading_algs = reading.mc_unpackers() + reading_algs -- GitLab From 69de1bf4e2b67314bb179440710505e6f4ddde93 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Wed, 1 Sep 2021 09:49:39 +0000 Subject: [PATCH 4/4] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/MooreAnalysis/-/jobs/16035784 --- HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py b/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py index 098271c..4a413d7 100644 --- a/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py +++ b/HltIntegrationTests/tests/options/hlt2_analysis/read_hlt2.py @@ -42,7 +42,8 @@ def get_hlt2_unpackers(is_simulation): an LHCb application. """ reading_algs = ([reading.decoder()] + reading.unpackers() + [ - UnpackRawEvent(BankTypes=['ODIN'], RawBankLocations=["DAQ/RawBanks/ODIN"]) + UnpackRawEvent( + BankTypes=['ODIN'], RawBankLocations=["DAQ/RawBanks/ODIN"]) ] + [createODIN()]) if is_simulation: reading_algs = reading.mc_unpackers() + reading_algs -- GitLab