Remove annsvc config

DaVinciExamples/example_data/Spruce_all_lines_olddst.yaml

 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
+input_manifest_file: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtime_newPacking.tck.json
 data_type: Upgrade
 input_type: ROOT
 simulation: true

DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml

 input_files:
    - root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/Upgrade_LbToLcmunu.dst
-annsvc_config: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/Upgrade_LbToLcmunu.tck.json
+input_manifest_file: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/Upgrade_LbToLcmunu.tck.json
 data_type: Upgrade
 input_type: ROOT
 simulation: True

DaVinciExamples/example_data/test_hlt1_trigger_decisions.yaml

@@ -7,7 +7,7 @@ conddb_tag: sim-20201218-vc-md100
 dddb_tag: dddb-20201211
 conditions_version: master
 geometry_version: trunk
-annsvc_config: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_integration_B0_100.tck.json
+input_manifest_file: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_integration_B0_100.tck.json
 evt_max: -1
 histo_file: hlt2_B0_test_histo.root
 lumi: false

DaVinciExamples/example_data/test_passthrough_thor_lines.yaml

 input_files:
 - root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.dst
-annsvc_config: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.tck.json
+input_manifest_file: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.tck.json
 data_type: Upgrade
 input_type: ROOT
 simulation: true

DaVinciExamples/example_data/test_spruce_MCtools.yaml

 input_files:
 - root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_realtimereco_dstinput.dst
-annsvc_config: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_example_realtime_dstinput.tck.json
+input_manifest_file: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_example_realtime_dstinput.tck.json
 data_type: Upgrade
 input_type: ROOT
 simulation: true

DaVinciTests/python/DaVinciTests/mc/option_davinci-issue-97_bkgcat_mc-truth.yaml

 input_files:
 - 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/test_davinci-issue-97_bkgcat_mc-truth.dst'
-annsvc_config: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/test_davinci-issue-97_bkgcat_mc-truth.tck.json'
+input_manifest_file: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/test_davinci-issue-97_bkgcat_mc-truth.tck.json'
 
 data_type: Upgrade
 input_type: ROOT

DaVinciTests/tests/options/option_davinci_funtuple_array.py

@@ -24,7 +24,7 @@ from PyConf.reading import get_particles
 
 from DaVinci import options
 
-options.annsvc_config = "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtime_newPacking.tck.json"
+options.input_manifest_file = "root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/spruce_all_lines_realtime_newPacking.tck.json"
 options.evt_max = 100
 options.histo_file = "DV-test-array-his.root"
 options.ntuple_file = "DV-test-array-ntp.root"

DaVinciTutorials/options.yaml

 input_files:
    - 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.dst'
-annsvc_config: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.tck.json'
+input_manifest_file: 'root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.tck.json'
 input_type: ROOT
 evt_max: 100
 ntuple_file: davinci_ntuple.root

Phys/DaVinci/python/DaVinci/LbExec.py

@@ -34,7 +34,6 @@ class Options(DefaultOptions):
     - input_stream (str): Stream name. Default is "default" (Note: for `input_process=Hlt2` the stream must be strictly empty. The default value is overwritten in this case.)
     - lumi (bool): Flag to store luminosity information. Default is False.
     - evt_pre_filters (dict[str,str]): Event pre-filter code. Default is None.
-    - annsvc_config (str): Path to the configuration file from sprucing or Hlt2. Default is None.
     - write_fsr (bool): Flag to write file summary record. Default is True.
     - merge_genfsr (bool): Flag to merge the file summary record. Default is False.
     - metainfo_additional_tags: (list): Additional central tags for `PyConf.filecontent_metadata.metainfo_repos`. Default is [].
@@ -43,7 +42,6 @@ class Options(DefaultOptions):
     input_stream: Optional[str] = "default"
     lumi: bool = False
     evt_pre_filters: Optional[dict[str, str]] = None
-    annsvc_config: Optional[str] = None
     write_fsr: bool = True
     merge_genfsr: bool = False
     metainfo_additional_tags: Optional[list] = []

Phys/DaVinci/python/DaVinci/config.py

@@ -170,11 +170,6 @@ def add_davinci_configurables(options, user_algorithms, public_tools):
             configured_ann_svc(json_file=options.input_manifest_file)
         ]
 
-    elif options.annsvc_config:  # this should be renamed to input_manifest_file
-        # distinguish between configuring the ANNSvc for decoding and unpacking
-        # manifest file is not needed for unpacking anymore
-        config.add(configured_ann_svc(json_file=options.annsvc_config))
-
     dvMainFlow = apply_filters(options, user_algorithms)
 
     fsrAlgs = make_fsr_algs(options)

doc/guide/running.rst

@@ -53,7 +53,7 @@ Also make a file named ``options.yaml`` containing:
 
     input_files:
     - root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.dst
-    annsvc_config: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.tck.json
+    input_manifest_file: root://eoslhcb.cern.ch//eos/lhcb/wg/dpa/wp3/tests/hlt2_passthrough_thor_lines.tck.json
     input_type: ROOT
     evt_max: 100
     ntuple_file: davinci_ntuple.root