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

update DFS API

parent 7057cc83

csst_common/data/dfs_conf.yml

+0 −2
Original line number Diff line number Diff line
@@ -4,11 +4,9 @@ pml: 
  CSST_DFS_GATEWAY: "172.24.21.2:30880"

  CSST_DFS_APP_ID: "test"

  CSST_DFS_APP_TOKEN: "test"

  CSST_DFS_LOGS_DIR=: "."



kmust:

  CSST_DFS_API_MODE: "cluster"

  CSST_DFS_GATEWAY: "222.197.214.168:30880"

  CSST_DFS_APP_ID: "1"

  CSST_DFS_APP_TOKEN: "1"
 
  CSST_DFS_LOGS_DIR=: "."

csst_common/data_manager.py

+16 −8
Original line number Diff line number Diff line
@@ -24,8 +24,9 @@ from astropy.table import Table 
from csst_dfs_api.facility.calmerge import CalMergeApi

from csst_dfs_api.facility.level0 import Level0DataApi

from csst_dfs_api.facility.level0prc import Level0PrcApi

from csst_dfs_api.msc.level1 import Level1DataApi

from csst_dfs_api.msc.level2 import Level2DataApi

from csst_dfs_api.mbi.level1 import Level1DataApi as MbiLevel1DataApi

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.level1prc import Level1PrcApi as SlsLevel1PrcApi

from csst_dfs_api.sls.level2spectra import Level2SpectraApi as SlsLevel2DataApi
@@ -163,6 +164,9 @@ class CsstMsDataManager: 
                 backend="multiprocessing"

                 ):



        # set DFS log dir

        os.environ["CSST_DFS_LOGS_DIR"] = "."



        # version

        assert ver_sim in CP["sim"]["versions"]

        self.ver_sim = ver_sim
@@ -254,16 +258,20 @@ class CsstMsDataManager: 
        return Level0DataApi()



    @property

    def dfs_L1DataApi(self):

        return Level1DataApi()

    def dfs_L0PrcApi(self):

        return Level0PrcApi()



    @property

    def dfs_L2DataApi(self):

        return Level2DataApi()

    def dfs_MbiL1DataApi(self):

        return MbiLevel1DataApi()



    @property

    def dfs_L0PrcApi(self):

        return Level0PrcApi()

    def dfs_MbiL1PrcApi(self):

        return MbiLevel1PrcApi()



    @property

    def dfs_MbiL2DataApi(self):

        return MbiLevel2DataApi()



    @property

    def dfs_SlsL1DataApi(self):