support C6.1 and C5.2 only

csst_common/data_manager.py

@@ -305,12 +305,14 @@ class CsstMsDataManager:
             path_aux="",
             use_dfs=False,
             dfs_node="kmust",
+            log_ppl="csst-l1ppl.log",
+            log_mod="csst-l1mod.log",
             n_jobs=18,
             backend="multiprocessing"
     ):
         """ initialize the multi-band imaging data manager """
 
-        assert ver_sim in ["C5.2", ]
+        assert ver_sim in CP["sim"]["versions"]
 
         # glob files
         fps_img = CsstMsDataManager.glob_image(dir_l0, ver_sim=ver_sim)
@@ -348,6 +350,8 @@ class CsstMsDataManager:
             _survey=_survey,
             obs_type=obs_type,
             l0_post="_".join(l0_post),
+            log_ppl=log_ppl,
+            log_mod=log_mod,
             n_jobs=n_jobs,
             backend=backend
         )
@@ -355,10 +359,7 @@ class CsstMsDataManager:
     @staticmethod
     def glob_image(dir_l0, ver_sim="C5.2"):
         """ glob files in L0 data directory """
-        if ver_sim == "C3":
-            pattern = os.path.join(dir_l0, "MSC_MS_*_raw.fits")
-        else:
-            assert ver_sim in ["C5.1", "C5.2"]
+        assert ver_sim in CP["sim"]["versions"]
         pattern = os.path.join(dir_l0, "CSST_MSC_MS_SCI_*.fits")
         fps = glob.glob(pattern)
         fps = [os.path.basename(fp) for fp in fps]
@@ -370,7 +371,7 @@ class CsstMsDataManager:
     @staticmethod
     def glob_cat(dir_l0, ver_sim="C5"):
         """ glob input catalogs in L0 data directory """
-        assert ver_sim in ["C5.1", "C5.2"]
+        assert ver_sim in CP["sim"]["versions"]
         pattern = os.path.join(dir_l0, "MSC_*.cat")
         fps = glob.glob(pattern)
         fps = [os.path.basename(fp) for fp in fps]
@@ -385,21 +386,21 @@ class CsstMsDataManager:
 
     def l0_cat(self, detector=6):
         """ the L0 cat file path"""
-        assert self.ver_sim == "C5.2"
+        assert self.ver_sim in CP["sim"]["versions"]
         fn = "{}_{}_chip_{:02d}_filt_{}.cat".format(
             self._instrument, self.obs_id, detector, self.detector2filter[detector])
         return os.path.join(self.dir_l0, fn)
 
     def l0_log(self, detector=6):
         """ L0 log file path """
-        assert self.ver_sim == "C5.2"
+        assert self.ver_sim in CP["sim"]["versions"]
         fn = "{}_{}_chip_{:02d}_filt_{}.log".format(
             self._instrument, self.obs_id, detector, self.detector2filter[detector])
         return os.path.join(self.dir_l0, fn)
 
     def l0_detector(self, detector=6):
         """ L0 detector-specific image file path """
-        assert self.ver_sim in ["C5.1", "C5.2"]
+        assert self.ver_sim in CP["sim"]["versions"]
         fn = "{}_{}_{}_SCI_{}_{}_{}_{:02d}_L0_1.fits".format(
             self._telescope, self._instrument, self._survey,
             self.exp_start, self.exp_stop, self.obs_id, detector)
@@ -407,7 +408,7 @@ class CsstMsDataManager:
 
     def l0_crs(self, detector=6):
         """ L0 cosmic ray file path """
-        assert self.ver_sim in ["C5.1", "C5.2"]
+        assert self.ver_sim in CP["sim"]["versions"]
         fn = "{}_{}_{}_CRS_{}_{}_{}_{:02d}_L0_1.fits".format(
             self._telescope, self._instrument, self._survey,
             self.exp_start, self.exp_stop, self.obs_id, detector)
@@ -429,7 +430,7 @@ class CsstMsDataManager:
         L1 file path
 
         """
-        assert self.ver_sim in ["C5.1", "C5.2"]
+        assert self.ver_sim in CP["sim"]["versions"]
         fn = "{}_{}_{}_SCI_{}_{}_{}_{:02d}_{}".format(
             self._telescope, self._instrument, self._survey,
             self.exp_start, self.exp_stop, self.obs_id, detector, post)
@@ -752,12 +753,17 @@ class CsstMsDataManager:
                 dst=os.path.join(dir_l0, os.path.basename(tbl["file_path"][i_rec])),
             )
 
-
         # initialize dm
         dm = CsstMsDataManager.from_dir(
-            ver_sim="C5.2", datatype=datatype, dir_l0=dir_l0, dir_l1=dir_l1,
-            path_aux=path_aux, use_dfs=use_dfs, dfs_node=dfs_node,
-            n_jobs=n_jobs, backend=backend
+            ver_sim="C5.2",
+            datatype=datatype,
+            dir_l0=dir_l0,
+            dir_l1=dir_l1,
+            path_aux=path_aux,
+            use_dfs=use_dfs,
+            dfs_node=dfs_node,
+            n_jobs=n_jobs,
+            backend=backend
         )
         assert dm.obs_id == obs_id