diff --git a/csst_common/data_manager.py b/csst_common/data_manager.py index 58c5037d2337c6efc17719f3d8141d90bc54974c..3b6e854ee31e2a67089c76bf465fe387f7dbfe37 100644 --- a/csst_common/data_manager.py +++ b/csst_common/data_manager.py @@ -380,23 +380,42 @@ class CsstMsDataManager: raise FileNotFoundError(f"No file found with pattern {pattern} in {dir_l0}") # parse filename - pattern = re.compile( - r"(?P[A-Z]+)_" - r"(?P[A-Z]+)_" - r"(?P[A-Z]+)_" - r"(?P[A-Z]+)_" - r"(?P[0-9]{14})_" - r"(?P[0-9]{14})_" - r"(?P[0-9]{11})_" - r"(?P[0-9]{2})_" - r"L(?P[0-9]{1})_" - r"V(?P[0-9]{2})" - r".(?P[a-z]{4})" - ) - mo = re.fullmatch(pattern, fps_img[0]) - assert mo is not None - mogd = mo.groupdict() - mogd.pop("detector") + if ver_sim == "C6.2": + pattern = re.compile( + r"(?P[A-Z]+)_" + r"(?P[A-Z]+)_" + r"(?P[A-Z]+)_" + r"(?P[A-Z]+)_" + r"(?P[0-9]{14})_" + r"(?P[0-9]{14})_" + r"(?P[0-9]{11})_" + r"(?P[0-9]{2})_" + r"L(?P[0-9]{1})_" + r"V(?P[0-9]{2})" + r".(?P[a-z]{4})" + ) + mo = re.fullmatch(pattern, fps_img[0]) + assert mo is not None + mogd = mo.groupdict() + mogd.pop("detector") + elif ver_sim == "C5.2": + pattern = re.compile( + r"(?P[A-Z]+)_" + r"(?P[A-Z]+)_" + r"(?P[A-Z]+)_" + r"(?P[A-Z]+)_" + r"(?P[0-9]{14})_" + r"(?P[0-9]{14})_" + r"(?P[0-9]{11})_" + r"(?P[0-9]{2})_" + r"L(?P[0-9]{1})_" + r"(?P[0-9]{1})" + r".(?P[a-z]{4})" + ) + mo = re.fullmatch(pattern, fps_img[0]) + assert mo is not None + mogd = mo.groupdict() + mogd.pop("detector") # available detectors available_detectors = [int(re.fullmatch(pattern, fp)["detector"]) for fp in fps_img]