From d72833535666134372e25b3bd672e26632ce2fc9 Mon Sep 17 00:00:00 2001
From: Davide Fazzini <davide.fazzini@cern.ch>
Date: Thu, 20 Feb 2025 15:25:58 +0100
Subject: [PATCH 1/3] remove redundant fsrSink declaration
---
Phys/DaVinci/python/DaVinci/config.py | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/Phys/DaVinci/python/DaVinci/config.py b/Phys/DaVinci/python/DaVinci/config.py
index 22954002a..f0a59e247 100644
--- a/Phys/DaVinci/python/DaVinci/config.py
+++ b/Phys/DaVinci/python/DaVinci/config.py
@@ -23,7 +23,6 @@ from PyConf.application import ( # type: ignore[import]
) # type: ignore[import]
from PyConf.control_flow import CompositeNode, NodeLogic # type: ignore[import]
from PyConf.components import setup_component # type: ignore[import]
-from PyConf.utils import get_fsr_configurations # type: ignore[import]
from DaVinci.algorithms import make_fsr_algs, apply_filters
log = logging.getLogger(__name__)
@@ -188,16 +187,7 @@ def add_davinci_configurables(options, user_algorithms, public_tools):
# Configuration for the creation of the lumiTree TTree
# with the total count of lumievents per run
if (not options.simulation) and options.lumi:
- config_fsr = str(json.dumps(dict(get_fsr_configurations())))
ApplicationMgr().ExtSvc += [
- config.add(
- setup_component(
- "LHCb__FSR__Sink",
- AcceptRegex=r"^LumiCounter\.eventsByRun$|^HltANNSvc\.DecodingKeys$",
- instance_name="FileSummaryRecord",
- ConfigurationFSRs=config_fsr,
- )
- ),
config.add(
setup_component(
"LHCb__FSR__LumiFSRtoTTree", instance_name="LumiFSRtoTTree"
--
GitLab
From 1ca2f428eec3326ff3604a1abaef312c0947af6b Mon Sep 17 00:00:00 2001
From: Davide Fazzini <davide.fazzini@cern.ch>
Date: Thu, 20 Feb 2025 15:31:20 +0100
Subject: [PATCH 2/3] fix linting
---
Phys/DaVinci/python/DaVinci/config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Phys/DaVinci/python/DaVinci/config.py b/Phys/DaVinci/python/DaVinci/config.py
index f0a59e247..61bf398fe 100644
--- a/Phys/DaVinci/python/DaVinci/config.py
+++ b/Phys/DaVinci/python/DaVinci/config.py
@@ -12,7 +12,7 @@
DaVinci configured using PyConf components.
"""
-import logging, json
+import logging
from pathlib import Path
from collections import namedtuple, OrderedDict
from Configurables import ApplicationMgr # type: ignore[import]
--
GitLab
From a167a159834e5b714888b53960a5817de6dfe878 Mon Sep 17 00:00:00 2001
From: Davide Fazzini <davide.fazzini@cern.ch>
Date: Fri, 21 Feb 2025 17:34:35 +0100
Subject: [PATCH 3/3] small fix
---
.../tupling.qms/test_davinci_tupling_All_TurboSpruce.qmt | 4 ++--
DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_TurboSpruce.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_TurboSpruce.qmt
index 67f3fb271..27d36b4ed 100755
--- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_TurboSpruce.qmt
+++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All_TurboSpruce.qmt
@@ -49,9 +49,9 @@
<text>DaVinciExamples.tupling.AllFunctors_TurboSpruce:alg_config</text>
</set></argument>
<argument name="validator"><text>
-from Moore.qmtest.exclusions import remove_known_warnings
+from DaVinciTests.QMTest.DaVinciExclusions import preprocessor
countErrorLines({"FATAL": 0, "WARNING": 0, "ERROR": 0},
- stdout=remove_known_warnings(stdout))
+ stdout=preprocessor(stdout))
findReferenceBlock("""HLTControlFlowMgr INFO StateTree: CFNode #executed #passed
diff --git a/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py b/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py
index 89bbc2c4b..a1a980bb8 100755
--- a/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py
+++ b/DaVinciTests/python/DaVinciTests/QMTest/DaVinciExclusions.py
@@ -69,6 +69,9 @@ remove_known_warnings = (
# backwards compatibility -- old data
r"DstData raw bank has a zero encoding key, and it is not explicitly specified for decoding -- make sure that this really what you want",
r"HltDecReports has a zero TCK, and it is not explicitly specified for decoding *",
+ r"ignoring key 0x[0-9a-f#]+ from FSR because an explicit Overrule has been configured -- .*",
+ r"key 0x[0-9a-f#]+ has been found in FSR -- using that",
+ r"HltANNSvc* +WARNING ignoring key 0x[0-9a-f#]+ from FSR because an explicit Overrule has been configured -- .*",
]
)
+ ignore_missing_hepmc_dicts
--
GitLab