From 1f9bff72f84f9f52ac1fecd2234babdcaa2dd36d Mon Sep 17 00:00:00 2001
From: BO ZHANG <bozhang@nao.cas.cn>
Date: Thu, 29 Sep 2022 18:04:03 +0800
Subject: [PATCH] updated CsstMsDataManager

---
 csst_common/data_manager.py | 49 +------------------------------------
 tests/test_data_manager.py  |  7 ++----
 2 files changed, 3 insertions(+), 53 deletions(-)

diff --git a/csst_common/data_manager.py b/csst_common/data_manager.py
index cd2ec41..a85bd5f 100644
--- a/csst_common/data_manager.py
+++ b/csst_common/data_manager.py
@@ -331,7 +331,7 @@ class CsstMsDataManager:
             path_aux = "/nfsdata/users/cham/L1Test/ref_C5.2/MSC_{}_*_{:02d}_combine.fits"
             dir_pcref = "/nfsdata/users/csstpipeline/L1Pipeline/msc/gaia_dr3/"
         elif hostname == "dandelion" and datatype == "sls":
-            dir_l0 = "/nfsdata/share/csst_simulation_data/Cycle-5-SimuData/multipleBandsImaging/" \
+            dir_l0 = "/nfsdata/share/csst_simulation_data/Cycle-5-SimuData/slitlessSpectroscopy/" \
                      "NGP_AstrometryON_shearOFF_Spec/MSC_{:07d}/".format(exposure_id)
             path_aux = ""
             dir_pcref = ""
@@ -663,50 +663,3 @@ class CsstMbiDataManager:
             raise ValueError("@DM: invalid hostname {}!".format(hostname))
 
         return CsstMbiDataManager(ver_sim=ver_sim, dir_l0=dir_l0, dir_l1=dir_l1, dir_pcref=dir_pcref, path_aux=path_aux)
-
-
-# DIR_SIM = {
-#     ("C5.2", "dandelion"): "/nfsdata/share/csst_simulation_data/Cycle-5-SimuData/multipleBandsImaging/"
-#                            "NGP_AstrometryON_shearOFF/MSC_{:07d}/",
-#     ("C5.2", "ubuntu"): "/nfsdata/share/csst_simulation_data/Cycle-5-SimuData/multipleBandsImaging/"
-#                         "NGP_AstrometryON_shearOFF/MSC_{:07d}/",
-# }
-
-if __name__ == "__main__":
-    # test C3
-    dm = CsstMbiDataManager(
-        ver_sim="C3", dir_l0="/data/L1Pipeline/msc/MSC_0000020", dir_l1="/data/L1Pipeline/msc/work")
-    print("----- L0 images -----")
-    print(dm.l0_detector(detector=6))
-    print(os.path.exists(dm.l0_detector(detector=6)))
-    print("----- L0 crs -----")
-    print(dm.l0_crs(detector=6))
-    print(os.path.exists(dm.l0_detector(detector=8)))
-    print("----- L0 input cat -----")
-    print(dm.l0_cat(8))
-    print(os.path.exists(dm.l0_cat(detector=8)))
-    print("----- available detectors -----")
-    print(dm.available_detectors)
-    print("----- L1 images -----")
-    print(dm.l1_detector(25, "img.fits"))
-
-    # test C5.1
-    dm = CsstMbiDataManager(
-        ver_sim="C5.1", dir_l0="/data/sim_data/MSC_0000100", dir_l1="/home/user/L1Pipeline/msc/work")
-    print("----- available detectors -----")
-    print(dm.available_detectors)
-    for detector in dm.available_detectors[:2]:
-        print("----- L0 images -----")
-        print(dm.l0_detector(detector=detector))
-        print(os.path.exists(dm.l0_detector(detector=detector)))
-        print("----- L0 crs -----")
-        print(dm.l0_crs(detector=detector))
-        print(os.path.exists(dm.l0_detector(detector=detector)))
-        print("----- L0 input cat -----")
-        print(dm.l0_cat(detector=detector))
-        print(os.path.exists(dm.l0_cat(detector=detector)))
-        print("----- L0 input log -----")
-        print(dm.l0_log(detector=detector))
-        print(os.path.exists(dm.l0_log(detector=detector)))
-        print("----- L1 images -----")
-        print(dm.l1_detector(detector, post="img.fits"))
diff --git a/tests/test_data_manager.py b/tests/test_data_manager.py
index 2d686d5..19be643 100644
--- a/tests/test_data_manager.py
+++ b/tests/test_data_manager.py
@@ -33,6 +33,8 @@ class TestCsstMsDataManager(unittest.TestCase):
     def setUp(self) -> None:
         self.dm_mbi = CsstMsDataManager.quickstart(ver_sim="C5.2", datatype="mbi", dir_l1=".", exposure_id=100)
         self.dm_sls = CsstMsDataManager.quickstart(ver_sim="C5.2", datatype="sls", dir_l1=".", exposure_id=100)
+        self.dm_mbi.set_detectors(detectors=None)
+        self.dm_sls.set_detectors(detectors=None)
 
     def test_mbi_data_existence(self):
         self.assertTrue(self.dm_mbi.available_detectors == CP["mbi"]["detectors"])
@@ -51,8 +53,3 @@ class TestCsstMsDataManager(unittest.TestCase):
         self.assertTrue(os.path.exists(self.dm_sls.l0_crs(6)))
         self.assertTrue(isinstance(self.dm_sls.l1_detector(6, post="img.fits"), str))
         self.assertTrue(isinstance(self.dm_sls.l1_file(name="some_file.ext", comment="a demo file"), str))
-
-
-# class TestParams(unittest.TestCase):
-#     def test_params(self):
-#         self.assertTrue(True)
-- 
GitLab