From b93555e96bb746e4492fbd76926f44065edb1075 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Tue, 12 Oct 2021 18:25:16 +0200
Subject: [PATCH] revert cal_tools.tools changes
---
src/cal_tools/tools.py | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/cal_tools/tools.py b/src/cal_tools/tools.py
index 94c4fe8b9..af1c02c04 100644
--- a/src/cal_tools/tools.py
+++ b/src/cal_tools/tools.py
@@ -57,7 +57,7 @@ def run_prop_seq_from_path(filename):
def map_modules_from_folder(in_folder, run, path_template, karabo_da,
- sequences=None, qm_naming=True):
+ sequences=None):
"""
Prepare queues of files to process.
Queues are stored in dictionary with module name Q{}M{} as a key
@@ -67,9 +67,7 @@ def map_modules_from_folder(in_folder, run, path_template, karabo_da,
:param path_template: Template for file name
e.g. `RAW-R{:04d}-{}-S{:05d}.h5`
:param karabo_da: List of data aggregators e.g. [AGIPD00, AGIPD01]
- :param sequences: List of sequences to be considered.
- :param qm_naming: Flag to use Q{}M{} naming convention for dict keys,
- instead of the karabo-da.
+ :param sequences: List of sequences to be considered
:return: Dictionary of queues of files, dictionary of module indexes,
total number of sequences, dictionary of number of sequences per module
"""
@@ -80,10 +78,7 @@ def map_modules_from_folder(in_folder, run, path_template, karabo_da,
sequences_qm = {}
for inset in karabo_da:
module_idx = int(inset[-2:])
- if qm_naming:
- name = module_index_to_qm(module_idx)
- else:
- name = inset
+ name = module_index_to_qm(module_idx)
module_files[name] = Queue()
sequences_qm[name] = 0
mod_ids[name] = module_idx
--
GitLab