From 537ed46add3d69c3aa9095894dbe0325636b1059 Mon Sep 17 00:00:00 2001
From: Michael Reuscher <michael.reuscher@desy.de>
Date: Wed, 12 Jul 2023 12:30:12 +0200
Subject: [PATCH] Simrunner 1.03 config as .json done multi tests are now in
---
simrunner/data_config.json | 39 ++++++++++++++++++++++++++++++++++----
simrunner/simrunner.py | 32 ++++++++++++++++++++-----------
2 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/simrunner/data_config.json b/simrunner/data_config.json
index a05af49..1a6cdd4 100644
--- a/simrunner/data_config.json
+++ b/simrunner/data_config.json
@@ -1,6 +1,37 @@
{
- "s": ["1M", "2M", "3M"],
- "n": ["30", "10", "20"],
- "i": ["0.1", "0.2", "0.3"],
- "N": ["4", "4", "4"]
+ "data_set_1":{
+ "-o": "test1",
+ "--posixDataDir": "protokoll",
+ "-n": "15",
+ "-s": "2M",
+ "-i": "0.1s",
+ "-N": "4"},
+ "data_set_2":{
+ "-o": "test2",
+ "--posixDataDir": "protokoll",
+ "-n": "20",
+ "-s": "1M",
+ "-i": "0.1s",
+ "-N": "4"},
+ "data_set_3":{
+ "-o": "test3",
+ "--posixDataDir": "protokoll",
+ "-n": "5",
+ "-s": "3M",
+ "-i": "0.1s",
+ "-N": "4"},
+ "data_set_4":{
+ "-o": "test4",
+ "--posixDataDir": "protokoll",
+ "-n": "10",
+ "-s": "4M",
+ "-i": "0.1s",
+ "-N": "4"},
+ "data_set_5":{
+ "-o": "test5",
+ "--posixDataDir": "protokoll",
+ "-n": "10",
+ "-s": "5M",
+ "-i": "0.1s",
+ "-N": "4"}
}
\ No newline at end of file
diff --git a/simrunner/simrunner.py b/simrunner/simrunner.py
index 0cc05fd..1ca00bb 100644
--- a/simrunner/simrunner.py
+++ b/simrunner/simrunner.py
@@ -15,27 +15,37 @@ def start_process(program_path, arguments):
return process
-def run_sim(d_config, m_folder, s_path):
- for data_set in range(len(d_config["s"])):
- size = d_config["s"][data_set]
- nevents = d_config["n"][data_set]
- interval = d_config["i"][data_set]
- threads = d_config["N"][data_set]
- folder_name = d_config["s"][data_set]
+def set_arguments(data_config):
+ data_config = read_config()
+ e_list = []
+ for outer_key in data_config.keys():
+ inner_dict = data_config[outer_key]
+ arguments = []
+ for k, v in inner_dict.items():
+ arguments.append(k)
+ arguments.append(v)
+ e_list.append(arguments)
+ return e_list
+
+
+def run_sim(e_list, m_folder, s_path):
+ for event in e_list:
+ folder_name = event[1]
relativ_path = os.path.join(m_folder, "output1", folder_name)
os.makedirs(relativ_path, mode=0o777, exist_ok=True)
- arguments = ["-o", relativ_path, "--posixDataDir", "protokoll", "-n", nevents,
- "-s", size, "-i", interval, "-N", threads]
+ event[1] = relativ_path
+ arguments = event
output = start_process(s_path, arguments)
print(output)
-data_config = read_config()
skript_path = os.path.abspath(__file__)
main_folder = os.path.dirname(os.path.dirname(skript_path))
data_path = os.path.join(main_folder, "protokoll")
sim_path = os.path.join(os.path.dirname(__file__), "../build/src/detsim")
os.makedirs(data_path, mode=0o777, exist_ok=True)
-run_sim(data_config, main_folder, sim_path)
+event_list = set_arguments(read_config())
+run_sim(event_list, main_folder, sim_path)
+
--
GitLab