From d958ee3d1ab89055986e32c48f7420afdb191e52 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Wed, 15 Mar 2023 10:10:25 -0600 Subject: [PATCH 01/13] Added Rich decoding tests between Rec and Allen. --- .../compare_hlt1_hlt2_rich_smart_ids.py | 36 +++++++++++++++++++ .../compare_hlt1_hlt2_rich_smart_ids.qmt | 29 +++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py create mode 100644 Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py new file mode 100644 index 00000000000..101f9c5e349 --- /dev/null +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -0,0 +1,36 @@ +############################################################################### +# (c) Copyright 2000-2018 CERN for the benefit of the LHCb Collaboration # +# # +# This software is distributed under the terms of the GNU General Public # +# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". # +# # +# In applying this licence, CERN does not waive the privileges and immunities # +# granted to it by virtue of its status as an Intergovernmental Organization # +# or submit itself to any jurisdiction. # +############################################################################### +from PyConf.Algorithms import TestRichSmartIDs +from PyConf.application import (configure_input, configure) +from PyConf.control_flow import (CompositeNode, NodeLogic) +from Allen.config import setup_allen_non_event_data_service +from AllenConf.rich_reconstruction import decode_rich1, decode_rich2 +from RecoConf.rich_reconstruction import make_rich_pixels +from Moore import options + +config = configure_input(options) +non_event_data_node = setup_allen_non_event_data_service() +allen_rich_decoding_rich1 = decode_rich(1) +allen_rich_decoding_rich2 = decode_rich(2) +rec_rich_pixels = make_rich_pixels() + +test_hits = TestRichSmartIDs( + rich1_smart_ids=allen_rich_decoding_rich1["dev_smart_ids"], + rich2_smart_ids=allen_rich_decoding_rich2["dev_smart_ids"], + RichDecodedData=rec_rich_pixels["RichDecodedData"]) + +cf_node = CompositeNode( + 'compare_rich_smart_ids', + combine_logic=NodeLogic.NONLAZY_OR, + children=[non_event_data_node, test_hits], + force_order=True) + +config.update(configure(options, cf_node)) diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt new file mode 100644 index 00000000000..7253a33e912 --- /dev/null +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt @@ -0,0 +1,29 @@ + + + + +gaudirun.py + + $LHCBROOT/tests/options/2022-data.py + $RECOCONFROOT/options/compare_hlt1_hlt2_rich_smart_ids.py + +true + + +from Moore.qmtest.exclusions import remove_known_warnings +countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, + stdout=remove_known_warnings(stdout)) + + + -- GitLab From 15d2b7284d503e5fc04cb72a504e94b230e5081c Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Wed, 15 Mar 2023 10:23:49 -0600 Subject: [PATCH 02/13] Fix import. --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index 101f9c5e349..6460da329f4 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -12,7 +12,7 @@ from PyConf.Algorithms import TestRichSmartIDs from PyConf.application import (configure_input, configure) from PyConf.control_flow import (CompositeNode, NodeLogic) from Allen.config import setup_allen_non_event_data_service -from AllenConf.rich_reconstruction import decode_rich1, decode_rich2 +from AllenConf.rich_reconstruction import decode_rich from RecoConf.rich_reconstruction import make_rich_pixels from Moore import options -- GitLab From 5a9de9adeebc5749ea75de949ec3649ffb3f0d5d Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Fri, 17 Mar 2023 14:24:19 -0600 Subject: [PATCH 03/13] Fix test location. --- .../qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt index 7253a33e912..fee597d8dfe 100644 --- a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt @@ -15,7 +15,7 @@ Make sure HLT1- and HLT2-decoded Rich smart IDs are the same gaudirun.py - $LHCBROOT/tests/options/2022-data.py + $LHCBROOT/Rich/RichDetectors/tests/options/2022-data.py $RECOCONFROOT/options/compare_hlt1_hlt2_rich_smart_ids.py true -- GitLab From 0112b31392ad8579530f717ba671e65ff8c9df9a Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Tue, 23 May 2023 09:42:35 +0200 Subject: [PATCH 04/13] Properly find 2022-data. --- .../qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt index fee597d8dfe..36a2b2f7a65 100644 --- a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt @@ -15,7 +15,7 @@ Make sure HLT1- and HLT2-decoded Rich smart IDs are the same gaudirun.py - $LHCBROOT/Rich/RichDetectors/tests/options/2022-data.py + $RICHDETECTORSROOT/tests/options/2022-data.py $RECOCONFROOT/options/compare_hlt1_hlt2_rich_smart_ids.py true -- GitLab From 7fe856cae3d134e7b806e1aa7f8aa7f93b8af4c2 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Fri, 2 Jun 2023 15:52:11 +0200 Subject: [PATCH 05/13] Add Rich options. --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 7 ++++--- .../decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index 6460da329f4..88952bff030 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -13,14 +13,15 @@ from PyConf.application import (configure_input, configure) from PyConf.control_flow import (CompositeNode, NodeLogic) from Allen.config import setup_allen_non_event_data_service from AllenConf.rich_reconstruction import decode_rich -from RecoConf.rich_reconstruction import make_rich_pixels +from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_options from Moore import options config = configure_input(options) -non_event_data_node = setup_allen_non_event_data_service() +non_event_data_node = setup_allen_non_event_data_service(bank_types=["Rich1", "Rich2"]) allen_rich_decoding_rich1 = decode_rich(1) allen_rich_decoding_rich2 = decode_rich(2) -rec_rich_pixels = make_rich_pixels() +reco_opts = default_rich_reco_options() +rec_rich_pixels = make_rich_pixels(options=reco_opts) test_hits = TestRichSmartIDs( rich1_smart_ids=allen_rich_decoding_rich1["dev_smart_ids"], diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt index 36a2b2f7a65..ad7d820099a 100644 --- a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt @@ -15,6 +15,7 @@ Make sure HLT1- and HLT2-decoded Rich smart IDs are the same gaudirun.py + $MOOREROOT/tests/options/digi_input_and_conds_Sim10aU1.py $RICHDETECTORSROOT/tests/options/2022-data.py $RECOCONFROOT/options/compare_hlt1_hlt2_rich_smart_ids.py -- GitLab From 6bb5d15b7e91b6dba102de1dac0e2994103d6be5 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Tue, 8 Aug 2023 04:32:03 +0000 Subject: [PATCH 06/13] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/31598547 --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index 88952bff030..cc41dbe94ab 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -17,7 +17,8 @@ from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_opt from Moore import options config = configure_input(options) -non_event_data_node = setup_allen_non_event_data_service(bank_types=["Rich1", "Rich2"]) +non_event_data_node = setup_allen_non_event_data_service( + bank_types=["Rich1", "Rich2"]) allen_rich_decoding_rich1 = decode_rich(1) allen_rich_decoding_rich2 = decode_rich(2) reco_opts = default_rich_reco_options() -- GitLab From 84d4cfe7c53bb4500cbcc457577e370ee57ed405 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Tue, 8 Aug 2023 15:16:57 +0200 Subject: [PATCH 07/13] Update configuration to use a newer file. --- .../options/compare_hlt1_hlt2_rich_smart_ids.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index cc41dbe94ab..04f72a4a0cc 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -8,7 +8,7 @@ # granted to it by virtue of its status as an Intergovernmental Organization # # or submit itself to any jurisdiction. # ############################################################################### -from PyConf.Algorithms import TestRichSmartIDs +from PyConf.Algorithms import TestAllenRichPixels from PyConf.application import (configure_input, configure) from PyConf.control_flow import (CompositeNode, NodeLogic) from Allen.config import setup_allen_non_event_data_service @@ -16,15 +16,20 @@ from AllenConf.rich_reconstruction import decode_rich from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_options from Moore import options +options.simulation = False +options.geometry_version = "trunk" +options.conditions_version = "online" +options.input_type = "MDF" +options.input_files = ["mdf:root://eoslhcb.cern.ch//eos/lhcb/hlt2/LHCb/0000248711/Run_0000248711_HLT20840_20221011-113809-426.mdf"] + config = configure_input(options) -non_event_data_node = setup_allen_non_event_data_service( - bank_types=["Rich1", "Rich2"]) +non_event_data_node = setup_allen_non_event_data_service(bank_types=["Rich1", "Rich2"]) allen_rich_decoding_rich1 = decode_rich(1) allen_rich_decoding_rich2 = decode_rich(2) reco_opts = default_rich_reco_options() rec_rich_pixels = make_rich_pixels(options=reco_opts) -test_hits = TestRichSmartIDs( +test_hits = TestAllenRichPixels( rich1_smart_ids=allen_rich_decoding_rich1["dev_smart_ids"], rich2_smart_ids=allen_rich_decoding_rich2["dev_smart_ids"], RichDecodedData=rec_rich_pixels["RichDecodedData"]) -- GitLab From d3ef0b2686514bef5fc3c47ff1f4952342f4ee40 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Wed, 9 Aug 2023 09:10:29 +0200 Subject: [PATCH 08/13] Use input and conds data 2022. --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 6 ------ .../decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index 04f72a4a0cc..5355784b648 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -16,12 +16,6 @@ from AllenConf.rich_reconstruction import decode_rich from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_options from Moore import options -options.simulation = False -options.geometry_version = "trunk" -options.conditions_version = "online" -options.input_type = "MDF" -options.input_files = ["mdf:root://eoslhcb.cern.ch//eos/lhcb/hlt2/LHCb/0000248711/Run_0000248711_HLT20840_20221011-113809-426.mdf"] - config = configure_input(options) non_event_data_node = setup_allen_non_event_data_service(bank_types=["Rich1", "Rich2"]) allen_rich_decoding_rich1 = decode_rich(1) diff --git a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt index ad7d820099a..ce74dfdcd00 100644 --- a/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt +++ b/Hlt/RecoConf/tests/qmtest/decoding.qms/compare_hlt1_hlt2_rich_smart_ids.qmt @@ -15,8 +15,7 @@ Make sure HLT1- and HLT2-decoded Rich smart IDs are the same gaudirun.py - $MOOREROOT/tests/options/digi_input_and_conds_Sim10aU1.py - $RICHDETECTORSROOT/tests/options/2022-data.py + $MOOREROOT/tests/options/mdf_input_and_conds_data_2022.py $RECOCONFROOT/options/compare_hlt1_hlt2_rich_smart_ids.py true -- GitLab From 6973c78dc5952cb4eabeaf59c714f312998056c6 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Thu, 10 Aug 2023 09:32:39 +0200 Subject: [PATCH 09/13] Set test over a single event. --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index 5355784b648..74b3d196bac 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -16,6 +16,7 @@ from AllenConf.rich_reconstruction import decode_rich from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_options from Moore import options +options.evt_max = 1 config = configure_input(options) non_event_data_node = setup_allen_non_event_data_service(bank_types=["Rich1", "Rich2"]) allen_rich_decoding_rich1 = decode_rich(1) -- GitLab From 34c88edcae7f7ccaadd1ad4c3d3df6904aca79b8 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Thu, 28 Sep 2023 16:52:52 +0200 Subject: [PATCH 10/13] Update test. --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index 74b3d196bac..af38adf3bd2 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -19,14 +19,12 @@ from Moore import options options.evt_max = 1 config = configure_input(options) non_event_data_node = setup_allen_non_event_data_service(bank_types=["Rich1", "Rich2"]) -allen_rich_decoding_rich1 = decode_rich(1) -allen_rich_decoding_rich2 = decode_rich(2) +allen_rich_decoding_rich = decode_rich() reco_opts = default_rich_reco_options() rec_rich_pixels = make_rich_pixels(options=reco_opts) test_hits = TestAllenRichPixels( - rich1_smart_ids=allen_rich_decoding_rich1["dev_smart_ids"], - rich2_smart_ids=allen_rich_decoding_rich2["dev_smart_ids"], + rich_smart_ids=allen_rich_decoding_rich["dev_smart_ids"], RichDecodedData=rec_rich_pixels["RichDecodedData"]) cf_node = CompositeNode( -- GitLab From 28552a07bc4bf76a31d180af3384b514ffc7df36 Mon Sep 17 00:00:00 2001 From: Gitlab CI Date: Thu, 28 Sep 2023 14:58:03 +0000 Subject: [PATCH 11/13] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb/Moore/-/jobs/32794066 --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index af38adf3bd2..eafed10f3fa 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -18,7 +18,8 @@ from Moore import options options.evt_max = 1 config = configure_input(options) -non_event_data_node = setup_allen_non_event_data_service(bank_types=["Rich1", "Rich2"]) +non_event_data_node = setup_allen_non_event_data_service( + bank_types=["Rich1", "Rich2"]) allen_rich_decoding_rich = decode_rich() reco_opts = default_rich_reco_options() rec_rich_pixels = make_rich_pixels(options=reco_opts) -- GitLab From 1ccb52908558831595d6091ec850c02e25af4b02 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Thu, 28 Sep 2023 17:00:46 +0200 Subject: [PATCH 12/13] Update the number of events tested to 100. --- Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py index eafed10f3fa..2d024f47cbf 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_rich_smart_ids.py @@ -16,7 +16,7 @@ from AllenConf.rich_reconstruction import decode_rich from RecoConf.rich_reconstruction import make_rich_pixels, default_rich_reco_options from Moore import options -options.evt_max = 1 +options.evt_max = 100 config = configure_input(options) non_event_data_node = setup_allen_non_event_data_service( bank_types=["Rich1", "Rich2"]) -- GitLab From f2692a2c101bdfa6d47040dd5163fcfcc0b5987f Mon Sep 17 00:00:00 2001 From: Saverio Mariani Date: Tue, 30 Jan 2024 17:49:59 +0100 Subject: [PATCH 13/13] Fix Moore --- .../options/compare_hlt1_hlt2_ut_hits_with_mcchecking.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hlt/RecoConf/options/compare_hlt1_hlt2_ut_hits_with_mcchecking.py b/Hlt/RecoConf/options/compare_hlt1_hlt2_ut_hits_with_mcchecking.py index 9a7a44435be..06b38e3c5f1 100644 --- a/Hlt/RecoConf/options/compare_hlt1_hlt2_ut_hits_with_mcchecking.py +++ b/Hlt/RecoConf/options/compare_hlt1_hlt2_ut_hits_with_mcchecking.py @@ -18,7 +18,7 @@ from RecoConf.hlt1_tracking import make_PrStorePrUTHits_hits from Moore import options config = configure_input(options) -non_event_data_node = setup_allen_non_event_data_service() +non_event_data_node = setup_allen_non_event_data_service(bank_types=["UT"]) allen_decoded_ut = decode_ut() with make_PrStorePrUTHits_hits.bind(isCluster=False): -- GitLab