From e2daaa923f23410ab1cdff185401b7bd5bc4ebf9 Mon Sep 17 00:00:00 2001
From: gitlabCI <gitlab-ci@cern.ch>
Date: Fri, 7 Feb 2025 13:12:24 +0100
Subject: [PATCH 1/2] write out streams config
---
GaudiConf/python/GaudiConf/LbExec/options.py | 7 +++++++
PyConf/python/PyConf/application.py | 6 ++++++
PyConf/python/PyConf/reading.py | 1 +
3 files changed, 14 insertions(+)
diff --git a/GaudiConf/python/GaudiConf/LbExec/options.py b/GaudiConf/python/GaudiConf/LbExec/options.py
index 27ab308b88c..db68f3633ca 100644
--- a/GaudiConf/python/GaudiConf/LbExec/options.py
+++ b/GaudiConf/python/GaudiConf/LbExec/options.py
@@ -147,6 +147,13 @@ class Options(BaseModel):
ntuple_file: Optional[str] = None
ntuple_basketsize: Optional[int] = 32000 # ROOT default
xml_summary_file: Optional[str] = None
+ # write configuration of lines in streams to json at runtime
+ write_streams_attributes_to_json: bool = False
+ # Output json file for configuration of lines in streams
+ output_streams_attributes_file: Optional[str] = "line_attribute_dict.json"
+ # Input json file for configuration of lines in streams
+ input_streams_attributes_file: Optional[str] = "line_attribute_dict.json"
+
"""Processing"""
n_threads: int = 1
# defaults to 1.2 * n_threads
diff --git a/PyConf/python/PyConf/application.py b/PyConf/python/PyConf/application.py
index 8aba4a63cc5..5655ca4423e 100644
--- a/PyConf/python/PyConf/application.py
+++ b/PyConf/python/PyConf/application.py
@@ -357,6 +357,11 @@ class ApplicationOptions(ConfigurableUser):
'control_flow_file': '',
# Data flow file name; not generated if empty
'data_flow_file': '',
+ # write configuration of lines in streams to json at runtime
+ "write_streams_attributes_to_json": False,
+ # Output json file for configuration of lines in streams
+ "output_streams_attributes_file": "line_attribute_dict.json",
+
# write application options to the FSR (File Summary Record)
'write_options_to_fsr': False,
# Output manifest of TES contents
@@ -369,6 +374,7 @@ class ApplicationOptions(ConfigurableUser):
'require_specific_decoding_keys': [],
# input manifest of TES contents -- only needed when running passthrough to produce the output manifest, and/or as source of decoding keys...
'input_manifest_file': '',
+ "input_streams_attributes_file": "",
# Algorithms to be executed before the main control flow.
# Could be used for controlling profiling, e.g. CallgrindProfile, PerfProfile.
'preamble_algs': [],
diff --git a/PyConf/python/PyConf/reading.py b/PyConf/python/PyConf/reading.py
index 0459426af41..12da94d8649 100644
--- a/PyConf/python/PyConf/reading.py
+++ b/PyConf/python/PyConf/reading.py
@@ -230,6 +230,7 @@ def get_pp2mcp_relations(location):
mc_location = location.replace(
"Relations/ChargedPP2MCP" if "Charged" in location else
"Relations/NeutralPP2MCP", "MC/Particles")
+
mc_parts = get_mc_particles(mc_location)
return _get_unpacked("PP2MCPRelations", location, ExtraInputs=[mc_parts])
--
GitLab
From 5e7e11bac58eba2253638230d8355f3692f62219 Mon Sep 17 00:00:00 2001
From: Gitlab CI <noreply@cern.ch>
Date: Fri, 7 Feb 2025 12:14:42 +0000
Subject: [PATCH 2/2] Fixed formatting
patch generated by https://gitlab.cern.ch/lhcb/LHCb/-/jobs/50603921
---
GaudiConf/python/GaudiConf/LbExec/options.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/GaudiConf/python/GaudiConf/LbExec/options.py b/GaudiConf/python/GaudiConf/LbExec/options.py
index db68f3633ca..3b006f81f0a 100644
--- a/GaudiConf/python/GaudiConf/LbExec/options.py
+++ b/GaudiConf/python/GaudiConf/LbExec/options.py
@@ -147,13 +147,12 @@ class Options(BaseModel):
ntuple_file: Optional[str] = None
ntuple_basketsize: Optional[int] = 32000 # ROOT default
xml_summary_file: Optional[str] = None
- # write configuration of lines in streams to json at runtime
+ # write configuration of lines in streams to json at runtime
write_streams_attributes_to_json: bool = False
# Output json file for configuration of lines in streams
output_streams_attributes_file: Optional[str] = "line_attribute_dict.json"
# Input json file for configuration of lines in streams
input_streams_attributes_file: Optional[str] = "line_attribute_dict.json"
-
"""Processing"""
n_threads: int = 1
# defaults to 1.2 * n_threads
--
GitLab