diff --git a/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml b/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml index f98a342c3c1eec6bdbf4f9915ed7f126cea6e384..8cde87c363aaa833026fcfef641e81e65534c099 100644 --- a/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml +++ b/DaVinciExamples/example_data/FEST_November_2021_dst_newPacking.yaml @@ -12,4 +12,4 @@ process: Hlt2 stream: default print_freq: 1000 input_raw_format: 0.5 -metainfo_repos: ['key-b5250c79','key-0ef72bf3'] +metainfo_additional_tags: ['key-b5250c79','key-0ef72bf3'] diff --git a/DaVinciExamples/example_data/Spruce_all_lines_dst.yaml b/DaVinciExamples/example_data/Spruce_all_lines_dst.yaml index c78b1ac6bbcc876a96edc63dcf5484b8f6b3a5c7..b7dcefd49528d973101abf2019c3d4314a6285c7 100644 --- a/DaVinciExamples/example_data/Spruce_all_lines_dst.yaml +++ b/DaVinciExamples/example_data/Spruce_all_lines_dst.yaml @@ -10,4 +10,4 @@ histo_file: sprucing_histos.root ntuple_file: sprucing_tuple.root input_raw_format: 0.5 process: Spruce -metainfo_repos: ['key-b04d6708', 'key-43a25419'] \ No newline at end of file +metainfo_additional_tags: ['key-b04d6708', 'key-43a25419'] diff --git a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt index 327f7820af1f009fa95c8782197396bcba05b09d..150eefeefd65da5bce750688f5e9d2bb43b10aaa 100755 --- a/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt +++ b/DaVinciExamples/tests/qmtest/tupling.qms/test_davinci_tupling_All.qmt @@ -39,7 +39,7 @@ print_freq: 1 process: 'Spruce' stream: 'default' - metainfo_repos: ['key-b04d6708', 'key-43a25419'] + metainfo_additional_tags: ['key-b04d6708', 'key-43a25419'] </text></argument> <argument name="timeout"><integer>1000</integer></argument> <argument name="args"><set> diff --git a/Phys/DaVinci/python/DaVinci/Configuration.py b/Phys/DaVinci/python/DaVinci/Configuration.py index 6ad1aca5d984492dcc9ccaf3272a67a811b19b7f..8465521267d6f30cc829bfe66f9190172b0ff7ea 100644 --- a/Phys/DaVinci/python/DaVinci/Configuration.py +++ b/Phys/DaVinci/python/DaVinci/Configuration.py @@ -40,7 +40,8 @@ def add_davinci_configurables(options, user_algorithms, public_tools): config = configure_input(options) if options.input_manifest_file: - metainfo_repos.global_bind(extra_central_tags=options.metainfo_repos) + metainfo_repos.global_bind( + extra_central_tags=options.metainfo_additional_tags) ApplicationMgr().ExtSvc += [configured_ann_svc()] diff --git a/Phys/DaVinci/python/DaVinci/LbExec.py b/Phys/DaVinci/python/DaVinci/LbExec.py index bb2d5d9d6ab0f719b58d367f78997c5091e4d23f..47427f920b31ad8ddcbbe4f063d3e6c237250282 100644 --- a/Phys/DaVinci/python/DaVinci/LbExec.py +++ b/Phys/DaVinci/python/DaVinci/LbExec.py @@ -22,7 +22,7 @@ class ProcessTypes(str, Enum): class Options(DefaultOptions): input_manifest_file: Optional[str] - metainfo_repos: Optional[list] + metainfo_additional_tags: Optional[list] annsvc_config: Optional[str] process: ProcessTypes = ProcessTypes.Turbo stream: str = "default"