From 816ea5987911755e2cabb363a6fa7404e7e3eb3c Mon Sep 17 00:00:00 2001 From: BO ZHANG Date: Mon, 28 Aug 2023 09:17:52 +0800 Subject: [PATCH] remove dfs_node --- csst_common/data_manager.py | 8 +++----- tests/test_data_manager.py | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/csst_common/data_manager.py b/csst_common/data_manager.py index 86a7cd9..264e6fc 100644 --- a/csst_common/data_manager.py +++ b/csst_common/data_manager.py @@ -646,7 +646,7 @@ class CsstMsDataManager: @staticmethod def quickstart( ver_sim="C6.2", datatype="mbi", dir_l1=".", exposure_id=100, - dfs_node="kmust", n_jobs=18, backend="multiprocessing" + n_jobs=18, backend="multiprocessing" ): """ Quick dataset generator for tests on dandelion or PML @@ -661,8 +661,6 @@ class CsstMsDataManager: output directory exposure_id : int The serial number of the exposure. 20-154 for C5.2. - dfs_node : str - The DFS node. Defaults to "kmust", could be "pml". n_jobs : int The number of jobs. backend : str @@ -688,7 +686,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_node=dfs_node, n_jobs=n_jobs, backend=backend + n_jobs=n_jobs, backend=backend ) def __repr__(self): @@ -886,7 +884,7 @@ class CsstMsDataManager: @staticmethod def from_dfs( obs_id="100000100", - ver_sim="C5.2", + ver_sim="C6.2", datatype="mbi", dir_l0="/pipeline/L0", dir_l1="/pipeline/L1", diff --git a/tests/test_data_manager.py b/tests/test_data_manager.py index 5d9df2f..7234473 100644 --- a/tests/test_data_manager.py +++ b/tests/test_data_manager.py @@ -21,9 +21,9 @@ dir_unittest = "/nfsdata/share/pipeline-unittest/csst_common" class TestCsstMsDataManager(unittest.TestCase): def setUp(self) -> None: self.dm_mbi = CsstMsDataManager.quickstart( - ver_sim="C6.2", datatype="mbi", dir_l1=dir_unittest, exposure_id=100, dfs_node="kmust") + ver_sim="C6.2", datatype="mbi", dir_l1=dir_unittest, exposure_id=100) self.dm_sls = CsstMsDataManager.quickstart( - ver_sim="C6.2", datatype="sls", dir_l1=dir_unittest, exposure_id=100, dfs_node="kmust") + ver_sim="C6.2", datatype="sls", dir_l1=dir_unittest, exposure_id=100) self.dm_mbi.target_detectors = None self.dm_sls.target_detectors = None -- GitLab