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 67f3fb27198e99ecc3acd00d3045f10e08ddcce4..27d36b4edafe1b4e712b76d1fbc678250ba2e967 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 89bbc2c4b233341d6a419ba4494da754b2501378..a1a980bb8c2f599894f57fa1536a200460a7be15 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 diff --git a/Phys/DaVinci/python/DaVinci/config.py b/Phys/DaVinci/python/DaVinci/config.py index 22954002a5df72044bda170c9aa756f275a7ff6e..61bf398fe7aeecbb2a67de567a3ab82504952bc6 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] @@ -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"