Commit cefadce4 authored by BO ZHANG's avatar BO ZHANG 🏀
Browse files

update DFS API

parent 7057cc83
...@@ -4,11 +4,9 @@ pml: ...@@ -4,11 +4,9 @@ pml:
CSST_DFS_GATEWAY: "172.24.21.2:30880" CSST_DFS_GATEWAY: "172.24.21.2:30880"
CSST_DFS_APP_ID: "test" CSST_DFS_APP_ID: "test"
CSST_DFS_APP_TOKEN: "test" CSST_DFS_APP_TOKEN: "test"
CSST_DFS_LOGS_DIR=: "."
kmust: kmust:
CSST_DFS_API_MODE: "cluster" CSST_DFS_API_MODE: "cluster"
CSST_DFS_GATEWAY: "222.197.214.168:30880" CSST_DFS_GATEWAY: "222.197.214.168:30880"
CSST_DFS_APP_ID: "1" CSST_DFS_APP_ID: "1"
CSST_DFS_APP_TOKEN: "1" CSST_DFS_APP_TOKEN: "1"
CSST_DFS_LOGS_DIR=: "."
...@@ -24,8 +24,9 @@ from astropy.table import Table ...@@ -24,8 +24,9 @@ from astropy.table import Table
from csst_dfs_api.facility.calmerge import CalMergeApi from csst_dfs_api.facility.calmerge import CalMergeApi
from csst_dfs_api.facility.level0 import Level0DataApi from csst_dfs_api.facility.level0 import Level0DataApi
from csst_dfs_api.facility.level0prc import Level0PrcApi from csst_dfs_api.facility.level0prc import Level0PrcApi
from csst_dfs_api.msc.level1 import Level1DataApi from csst_dfs_api.mbi.level1 import Level1DataApi as MbiLevel1DataApi
from csst_dfs_api.msc.level2 import Level2DataApi from csst_dfs_api.mbi.level1prc import Level1PrcApi as MbiLevel1PrcApi
from csst_dfs_api.mbi.level2 import Level2DataApi as MbiLevel2DataApi
from csst_dfs_api.sls.level1 import Level1DataApi as SlsLevel1DataApi from csst_dfs_api.sls.level1 import Level1DataApi as SlsLevel1DataApi
from csst_dfs_api.sls.level1prc import Level1PrcApi as SlsLevel1PrcApi from csst_dfs_api.sls.level1prc import Level1PrcApi as SlsLevel1PrcApi
from csst_dfs_api.sls.level2spectra import Level2SpectraApi as SlsLevel2DataApi from csst_dfs_api.sls.level2spectra import Level2SpectraApi as SlsLevel2DataApi
...@@ -163,6 +164,9 @@ class CsstMsDataManager: ...@@ -163,6 +164,9 @@ class CsstMsDataManager:
backend="multiprocessing" backend="multiprocessing"
): ):
# set DFS log dir
os.environ["CSST_DFS_LOGS_DIR"] = "."
# version # version
assert ver_sim in CP["sim"]["versions"] assert ver_sim in CP["sim"]["versions"]
self.ver_sim = ver_sim self.ver_sim = ver_sim
...@@ -254,16 +258,20 @@ class CsstMsDataManager: ...@@ -254,16 +258,20 @@ class CsstMsDataManager:
return Level0DataApi() return Level0DataApi()
@property @property
def dfs_L1DataApi(self): def dfs_L0PrcApi(self):
return Level1DataApi() return Level0PrcApi()
@property @property
def dfs_L2DataApi(self): def dfs_MbiL1DataApi(self):
return Level2DataApi() return MbiLevel1DataApi()
@property @property
def dfs_L0PrcApi(self): def dfs_MbiL1PrcApi(self):
return Level0PrcApi() return MbiLevel1PrcApi()
@property
def dfs_MbiL2DataApi(self):
return MbiLevel2DataApi()
@property @property
def dfs_SlsL1DataApi(self): def dfs_SlsL1DataApi(self):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment