diff --git a/csst_common/data_manager.py b/csst_common/data_manager.py index a4874d37fc8c5ec123123f308655bd6cf1576acd..4c0979caf41028bd60dcf42c90774a73534a55ac 100644 --- a/csst_common/data_manager.py +++ b/csst_common/data_manager.py @@ -275,7 +275,7 @@ class CsstMsDataManager: raise DeprecationWarning("This method is deprecated, please directly use dm.target_detectors = detectors!") @staticmethod - def from_dir(ver_sim="C5.2", datatype="mbi", dir_l0=".", dir_l1=".", path_aux="", dfs_mode=False, dfs_node="kmust"): + def from_dir(ver_sim="C5.2", datatype="mbi", dir_l0=".", dir_l1=".", path_aux="", use_dfs=False, dfs_node="kmust"): """ initialize the multi-band imaging data manager """ assert ver_sim in ["C5.2", ] @@ -305,7 +305,7 @@ class CsstMsDataManager: dir_l0=dir_l0, dir_l1=dir_l1, path_aux=path_aux, # bias dark flat - use_dfs=dfs_mode, + use_dfs=use_dfs, dfs_node=dfs_node, obs_id=obs_id, exp_start=exp_start, @@ -467,7 +467,7 @@ class CsstMsDataManager: @staticmethod def quickstart(ver_sim="C5.2", datatype="mbi", dir_l1=".", exposure_id=100, - dfs_mode=False, dfs_node="kmust", clear_dir=False): + use_dfs=False, dfs_node="kmust", clear_dir=False): """ Quick dataset generator for tests on dandelion or PML @@ -481,7 +481,7 @@ class CsstMsDataManager: output directory exposure_id : int The serial number of the exposure. 20-154 for C5.2. - dfs_mode : bool + use_dfs : bool If True, use DFS. dfs_node : str The DFS node. Defaults to "kmust", could be "pml". @@ -522,7 +522,7 @@ class CsstMsDataManager: return CsstMsDataManager.from_dir( ver_sim=ver_sim, datatype=datatype, dir_l0=dir_l0, dir_l1=dir_l1, path_aux=path_aux, - dfs_mode=dfs_mode, dfs_node=dfs_node) + use_dfs=use_dfs, dfs_node=dfs_node) def __repr__(self): lines = "" @@ -599,7 +599,7 @@ class CsstMsDataManager: datatype="mbi", dir_l0="/L1Pipeline/L0", dir_l1="/L1Pipeline/L1", - dfs_mode=True, + use_dfs=True, dfs_node="pml" ): """ Initialize CsstMsDataManager from DFS. """ @@ -646,7 +646,7 @@ class CsstMsDataManager: # initialize dm dm = CsstMsDataManager.from_dir( ver_sim="C5.2", datatype=datatype, dir_l0=dir_l0, dir_l1=dir_l1, - path_aux=path_aux, dfs_mode=dfs_mode, dfs_node=dfs_node + path_aux=path_aux, use_dfs=use_dfs, dfs_node=dfs_node ) assert dm.obs_id == obs_id diff --git a/tests/test_data_manager.py b/tests/test_data_manager.py index 0f363ea760c2a492bd567b0ec71cc6c6ebcc8569..cfe2b5c4da16840a5312aedf8c495abe4271ef8b 100644 --- a/tests/test_data_manager.py +++ b/tests/test_data_manager.py @@ -19,9 +19,9 @@ dir_unittest = "/nfsdata/users/csstpipeline/L1Pipeline/unittests/csst_common" class TestCsstMsDataManager(unittest.TestCase): def setUp(self) -> None: self.dm_mbi = CsstMsDataManager.quickstart( - ver_sim="C5.2", datatype="mbi", dir_l1=dir_unittest, exposure_id=100, dfs_mode=False, dfs_node="kmust") + ver_sim="C5.2", datatype="mbi", dir_l1=dir_unittest, exposure_id=100, use_dfs=False, dfs_node="kmust") self.dm_sls = CsstMsDataManager.quickstart( - ver_sim="C5.2", datatype="sls", dir_l1=dir_unittest, exposure_id=100, dfs_mode=False, dfs_node="kmust") + ver_sim="C5.2", datatype="sls", dir_l1=dir_unittest, exposure_id=100, use_dfs=False, dfs_node="kmust") self.dm_mbi.target_detectors = None self.dm_sls.target_detectors = None