From 135b2eb46ab887a8a61d43ce1887425d5a2d3273 Mon Sep 17 00:00:00 2001 From: shoulinwei Date: Tue, 21 Jun 2022 15:44:10 +0800 Subject: [PATCH] ifs write level0 --- csst_dfs_api/ifs/level0.py | 10 +---- csst_dfs_api/mci/level0.py | 11 ++---- tests/ifs/test_ifs_level0.py | 39 +++++++------------ ...ifs_cal_merge.py => test_mci_cal_merge.py} | 0 ...{test_ifs_level0.py => test_mci_level0.py} | 8 ---- ...s_level0_prc.py => test_mci_level0_prc.py} | 0 ...{test_ifs_level1.py => test_mci_level1.py} | 0 ...s_level1_prc.py => test_mci_level1_prc.py} | 0 8 files changed, 20 insertions(+), 48 deletions(-) rename tests/mci/{test_ifs_cal_merge.py => test_mci_cal_merge.py} (100%) rename tests/mci/{test_ifs_level0.py => test_mci_level0.py} (74%) rename tests/mci/{test_ifs_level0_prc.py => test_mci_level0_prc.py} (100%) rename tests/mci/{test_ifs_level1.py => test_mci_level1.py} (100%) rename tests/mci/{test_ifs_level1_prc.py => test_mci_level1_prc.py} (100%) diff --git a/csst_dfs_api/ifs/level0.py b/csst_dfs_api/ifs/level0.py index db37149..db9a8eb 100644 --- a/csst_dfs_api/ifs/level0.py +++ b/csst_dfs_api/ifs/level0.py @@ -70,14 +70,8 @@ class Level0DataApi(object): ''' insert a level0 data record into database :param kwargs: Parameter dictionary, key items support: - obs_id = [str], - detector_no = [str], - obs_type = [str], - obs_time = [str], - exp_time = [int], - detector_status_id = [int], - filename = [str], - file_path = [str] + file_path = [str], + copyfiles = [boolean] :returns: csst_dfs_common.models.Result ''' diff --git a/csst_dfs_api/mci/level0.py b/csst_dfs_api/mci/level0.py index 28cdbb8..586390e 100644 --- a/csst_dfs_api/mci/level0.py +++ b/csst_dfs_api/mci/level0.py @@ -65,14 +65,9 @@ class Level0DataApi(object): ''' insert a level0 data record into database :param kwargs: Parameter dictionary, key items support: - obs_id = [str], - detector_no = [str], - obs_type = [str], - obs_time = [str], - exp_time = [int], - detector_status_id = [int], - filename = [str], - file_path = [str] + + file_path = [str], + copyfiles = [boolean] :returns: csst_dfs_common.models.Result ''' diff --git a/tests/ifs/test_ifs_level0.py b/tests/ifs/test_ifs_level0.py index 89c2715..6f0485c 100644 --- a/tests/ifs/test_ifs_level0.py +++ b/tests/ifs/test_ifs_level0.py @@ -9,34 +9,25 @@ class IFSLevel0DataTestCase(unittest.TestCase): def setUp(self): self.api = Level0DataApi() - def test_find(self): - recs = self.api.find(obs_id = '000009', obs_type = 'sci', limit = 0) - print('find:', recs) + # def test_find(self): + # result = self.api.find(ra = 248, dec = 87, radius = 2, limit = 0, obs_type = "sky") + # print('find:', result) - def test_get(self): - rec = self.api.get(id = 100) - print('get:', rec) + # def test_get(self): + # result = self.api.get(id = 1) + # print('get:', result.data) - rec = self.api.get(level0_id = '1000000102') - print('get:', rec) + # rec = self.api.get(level0_id = '300000145CCD231-c4') + # print('get:', rec) - def test_update_proc_status(self): - rec = self.api.update_proc_status(level0_id = '000001102', status = 6) - print('update_proc_status:', rec) + # def test_update_proc_status(self): + # rec = self.api.update_proc_status(level0_id = '000001102', status = 6) + # print('update_proc_status:', rec) - def test_update_qc0_status(self): - rec = self.api.update_qc0_status(level0_id = '000001102', status = 7) - print('update_qc0_status:', rec) + # def test_update_qc0_status(self): + # rec = self.api.update_qc0_status(level0_id = '000001102', status = 7) + # print('update_qc0_status:', rec) def test_write(self): - rec = self.api.write( - level0_id = '000001101', - obs_id = '0000011', - detector_no = "01", - obs_type = "sci", - obs_time = "2021-06-06 11:12:13", - exp_time = 150, - detector_status_id = 3, - filename = "MSC_00001234", - file_path = "/opt/MSC_00001234.fits") + rec = self.api.write(file_path = "/Users/wsl/temp/csst/ifs_data/sky_Data/CSST_IFS_B_sky_20211225001425_20211225001925_300000013_X_L0_VER_I4203.fits") print('write:', rec) \ No newline at end of file diff --git a/tests/mci/test_ifs_cal_merge.py b/tests/mci/test_mci_cal_merge.py similarity index 100% rename from tests/mci/test_ifs_cal_merge.py rename to tests/mci/test_mci_cal_merge.py diff --git a/tests/mci/test_ifs_level0.py b/tests/mci/test_mci_level0.py similarity index 74% rename from tests/mci/test_ifs_level0.py rename to tests/mci/test_mci_level0.py index 0d637cc..9458d20 100644 --- a/tests/mci/test_ifs_level0.py +++ b/tests/mci/test_mci_level0.py @@ -30,13 +30,5 @@ class MCILevel0DataTestCase(unittest.TestCase): def test_write(self): rec = self.api.write( - level0_id = '000001101', - obs_id = '0000011', - detector_no = "01", - obs_type = "sci", - obs_time = "2021-06-06 11:12:13", - exp_time = 150, - detector_status_id = 3, - filename = "MSC_00001234", file_path = "/opt/MSC_00001234.fits") print('write:', rec) \ No newline at end of file diff --git a/tests/mci/test_ifs_level0_prc.py b/tests/mci/test_mci_level0_prc.py similarity index 100% rename from tests/mci/test_ifs_level0_prc.py rename to tests/mci/test_mci_level0_prc.py diff --git a/tests/mci/test_ifs_level1.py b/tests/mci/test_mci_level1.py similarity index 100% rename from tests/mci/test_ifs_level1.py rename to tests/mci/test_mci_level1.py diff --git a/tests/mci/test_ifs_level1_prc.py b/tests/mci/test_mci_level1_prc.py similarity index 100% rename from tests/mci/test_ifs_level1_prc.py rename to tests/mci/test_mci_level1_prc.py -- GitLab