Skip to content
Snippets Groups Projects
Commit c608b6d9 authored by Sevda Esen's avatar Sevda Esen Committed by Gerhard Raven
Browse files

add tests to use new metainfo

parent ebfb4d26
No related branches found
No related tags found
2 merge requests!1103Draft: Add AnalysisHelpers to DaVinci Stack,!733Adapt to LHCb!3528 - Enforce use of an encoding/decoding key (TCK) in all Hlt encoders/decoders, do not use online-reserved bits in SourceID, remove explicit mention of 'packed' locations, enable 'stable' persist reco locations
input_files:
- root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/NovemberFEST/hlt2_D0_Kpi_10evts_newPacking.dst
annsvc_config: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/NovemberFEST/hlt2_D0_Kpi_10evts_newPacking.tck.json
- root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/NovemberFEST/hlt2_D0_Kpi_100evts_newPacking_newDst.dst
input_manifest_file: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/NovemberFEST/hlt2_D0_Kpi_100evts_newPacking_newDst.tck.json
data_type: Upgrade
input_type: ROOT
simulation: true
......@@ -12,3 +12,4 @@ process: Hlt2
stream: default
print_freq: 1000
input_raw_format: 0.5
metainfo_repos: ['key-b5250c79','key-0ef72bf3']
input_files:
- root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtimereco_newPacking.dst
annsvc_config: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtime_newPacking.tck.json
- root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtimereco_newPacking_newDst.dst
input_manifest_file: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtime_newPacking_newDst.tck.json
data_type: Upgrade
input_type: ROOT
simulation: true
......@@ -10,3 +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
......@@ -324,6 +324,7 @@ def alg_config(options: Options):
loki_preamble=[],
inputs=bd2dsk_data)
#
# Algorithms to be run
#
......
......@@ -65,7 +65,7 @@ def main(options: Options):
"piplus": daughter_variables
}
line_name = 'Hlt2CharmD0ToKmPipLine'
line_name = 'Hlt2Charm_D0ToKmPip_Line'
d02kpi_data = force_location(f"/Event/HLT2/{line_name}/Particles")
my_filter = add_filter(options, "HDRFilter_D0Kpi",
......
......@@ -26,8 +26,8 @@
<!-- Minimum bias dst processed using topo {2,3} hlt2 lines and all sprucing lines -->
<argument name="extra_options_yaml"><text>
input_files:
- root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtimereco_newPacking.dst'
annsvc_config: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtime_newPacking.tck.json'
- root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtimereco_newPacking_newDst.dst'
input_manifest_file: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtime_newPacking_newDst.tck.json'
data_type: Upgrade
input_type: ROOT
simulation: true
......@@ -39,6 +39,7 @@
print_freq: 1
process: 'Spruce'
stream: 'default'
metainfo_repos: ['key-b04d6708', 'key-43a25419']
</text></argument>
<argument name="timeout"><integer>1000</integer></argument>
<argument name="args"><set>
......
......@@ -16,6 +16,8 @@ from PyConf.Algorithms import EventAccounting
from DaVinci.algorithms import (define_fsr_writer, apply_filters_and_unpacking)
from DaVinci.config import davinci_control_flow, prepare_davinci_nodes
from .utils import load_file
from PyConf.application import metainfo_repos
from Configurables import ApplicationMgr
def add_davinci_configurables(options, user_algorithms, public_tools):
......@@ -37,7 +39,12 @@ def add_davinci_configurables(options, user_algorithms, public_tools):
config = configure_input(options)
if options.annsvc_config: # this should be renamed to input_manifest_file
if options.input_manifest_file:
metainfo_repos.global_bind( extra_central_tags = options.metainfo_repos )
ApplicationMgr().ExtSvc += [configured_ann_svc()]
elif options.annsvc_config: # this should be renamed to input_manifest_file
# distinguish between configuring the ANNSvc for decoding, and getting
# the manifest to configure the unpacking (the latter has _NOTHING_ to
# do with the ANNSvc)
......
......@@ -22,6 +22,7 @@ class ProcessTypes(str, Enum):
class Options(DefaultOptions):
input_manifest_file: Optional[str]
metainfo_repos: Optional[list]
annsvc_config: Optional[str]
process: ProcessTypes = ProcessTypes.Turbo
stream: str = "default"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment