From 19b5c1cb8dd3db1ac93e0318b06a3742b3038471 Mon Sep 17 00:00:00 2001
From: Patrick Koppenburg <patrick.koppenburg@cern.ch>
Date: Fri, 4 Aug 2023 17:00:58 +0200
Subject: [PATCH] Remove annsvc config
---
DaVinciExamples/example_data/Spruce_all_lines_olddst.yaml | 2 +-
DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml | 2 +-
.../example_data/test_hlt1_trigger_decisions.yaml | 2 +-
.../example_data/test_passthrough_thor_lines.yaml | 2 +-
DaVinciExamples/example_data/test_spruce_MCtools.yaml | 2 +-
.../mc/option_davinci-issue-97_bkgcat_mc-truth.yaml | 2 +-
DaVinciTests/tests/options/option_davinci_funtuple_array.py | 2 +-
DaVinciTutorials/options.yaml | 2 +-
Phys/DaVinci/python/DaVinci/LbExec.py | 2 --
Phys/DaVinci/python/DaVinci/config.py | 5 -----
doc/guide/running.rst | 2 +-
11 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/DaVinciExamples/example_data/Spruce_all_lines_olddst.yaml b/DaVinciExamples/example_data/Spruce_all_lines_olddst.yaml
index c13cfc887..d3dc93a21 100644
--- a/DaVinciExamples/example_data/Spruce_all_lines_olddst.yaml
+++ b/DaVinciExamples/example_data/Spruce_all_lines_olddst.yaml
@@ -1,6 +1,6 @@
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
diff --git a/DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml b/DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml
index d68b734cf..b12cd7681 100644
--- a/DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml
+++ b/DaVinciExamples/example_data/Upgrade_LbToLcmunu.yaml
@@ -1,6 +1,6 @@
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
diff --git a/DaVinciExamples/example_data/test_hlt1_trigger_decisions.yaml b/DaVinciExamples/example_data/test_hlt1_trigger_decisions.yaml
index 346cfb3ca..10bc474d0 100644
--- a/DaVinciExamples/example_data/test_hlt1_trigger_decisions.yaml
+++ b/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
diff --git a/DaVinciExamples/example_data/test_passthrough_thor_lines.yaml b/DaVinciExamples/example_data/test_passthrough_thor_lines.yaml
index d6263be3e..5eff875d2 100644
--- a/DaVinciExamples/example_data/test_passthrough_thor_lines.yaml
+++ b/DaVinciExamples/example_data/test_passthrough_thor_lines.yaml
@@ -1,6 +1,6 @@
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
diff --git a/DaVinciExamples/example_data/test_spruce_MCtools.yaml b/DaVinciExamples/example_data/test_spruce_MCtools.yaml
index c857c455e..3ee24be25 100644
--- a/DaVinciExamples/example_data/test_spruce_MCtools.yaml
+++ b/DaVinciExamples/example_data/test_spruce_MCtools.yaml
@@ -1,6 +1,6 @@
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
diff --git a/DaVinciTests/python/DaVinciTests/mc/option_davinci-issue-97_bkgcat_mc-truth.yaml b/DaVinciTests/python/DaVinciTests/mc/option_davinci-issue-97_bkgcat_mc-truth.yaml
index cd3ad220a..3aea4c56b 100644
--- a/DaVinciTests/python/DaVinciTests/mc/option_davinci-issue-97_bkgcat_mc-truth.yaml
+++ b/DaVinciTests/python/DaVinciTests/mc/option_davinci-issue-97_bkgcat_mc-truth.yaml
@@ -1,6 +1,6 @@
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
diff --git a/DaVinciTests/tests/options/option_davinci_funtuple_array.py b/DaVinciTests/tests/options/option_davinci_funtuple_array.py
index 328990fb6..07a8a5e2b 100644
--- a/DaVinciTests/tests/options/option_davinci_funtuple_array.py
+++ b/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"
diff --git a/DaVinciTutorials/options.yaml b/DaVinciTutorials/options.yaml
index cf640ccd4..49413a146 100644
--- a/DaVinciTutorials/options.yaml
+++ b/DaVinciTutorials/options.yaml
@@ -1,6 +1,6 @@
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
diff --git a/Phys/DaVinci/python/DaVinci/LbExec.py b/Phys/DaVinci/python/DaVinci/LbExec.py
index 8e15b3c20..8a6aa1535 100644
--- a/Phys/DaVinci/python/DaVinci/LbExec.py
+++ b/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] = []
diff --git a/Phys/DaVinci/python/DaVinci/config.py b/Phys/DaVinci/python/DaVinci/config.py
index 9c0972b36..69fe0ac3d 100644
--- a/Phys/DaVinci/python/DaVinci/config.py
+++ b/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)
diff --git a/doc/guide/running.rst b/doc/guide/running.rst
index ef2d11043..3a2bbf55c 100644
--- a/doc/guide/running.rst
+++ b/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
--
GitLab