From 8519b59b5d8467e9ab19e91d29fbfea399efd0a4 Mon Sep 17 00:00:00 2001
From: BO ZHANG <bozhang@nao.cas.cn>
Date: Fri, 17 Mar 2023 13:19:10 +0800
Subject: [PATCH] compatible with C5.2 naming convention

---
 csst_common/data_manager.py | 53 +++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/csst_common/data_manager.py b/csst_common/data_manager.py
index 58c5037..3b6e854 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<telescope>[A-Z]+)_"
-            r"(?P<instrument>[A-Z]+)_"
-            r"(?P<project>[A-Z]+)_"
-            r"(?P<obs_type>[A-Z]+)_"
-            r"(?P<exp_start>[0-9]{14})_"
-            r"(?P<exp_stop>[0-9]{14})_"
-            r"(?P<obs_id>[0-9]{11})_"
-            r"(?P<detector>[0-9]{2})_"
-            r"L(?P<level>[0-9]{1})_"
-            r"V(?P<version>[0-9]{2})"
-            r".(?P<ext>[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<telescope>[A-Z]+)_"
+                r"(?P<instrument>[A-Z]+)_"
+                r"(?P<project>[A-Z]+)_"
+                r"(?P<obs_type>[A-Z]+)_"
+                r"(?P<exp_start>[0-9]{14})_"
+                r"(?P<exp_stop>[0-9]{14})_"
+                r"(?P<obs_id>[0-9]{11})_"
+                r"(?P<detector>[0-9]{2})_"
+                r"L(?P<level>[0-9]{1})_"
+                r"V(?P<version>[0-9]{2})"
+                r".(?P<ext>[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<telescope>[A-Z]+)_"
+                r"(?P<instrument>[A-Z]+)_"
+                r"(?P<project>[A-Z]+)_"
+                r"(?P<obs_type>[A-Z]+)_"
+                r"(?P<exp_start>[0-9]{14})_"
+                r"(?P<exp_stop>[0-9]{14})_"
+                r"(?P<obs_id>[0-9]{11})_"
+                r"(?P<detector>[0-9]{2})_"
+                r"L(?P<level>[0-9]{1})_"
+                r"(?P<version>[0-9]{1})"
+                r".(?P<ext>[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]
-- 
GitLab