From b4da1069f394c12f9bb31ba51cb2de075841b30d Mon Sep 17 00:00:00 2001 From: BO ZHANG Date: Thu, 29 Sep 2022 18:59:52 +0800 Subject: [PATCH] tweaks --- csst_common/data_manager.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/csst_common/data_manager.py b/csst_common/data_manager.py index b771e79..e7b9265 100644 --- a/csst_common/data_manager.py +++ b/csst_common/data_manager.py @@ -12,6 +12,7 @@ import os import glob import re +import numpy as np from astropy.io import fits from .params import CSST_PARAMS as CP @@ -266,15 +267,18 @@ class CsstMsDataManager: print("final target detector IDs are ", self.target_detectors) return - def get_bias(self, detector=6): + def get_bias(self, detector=6) -> np.ndarray: + """ get bias data """ fp = glob.glob(self.path_aux.format("CLB", detector))[0] return fits.getdata(fp) - def get_dark(self, detector=6): + def get_dark(self, detector=6) -> np.ndarray: + """ get dark data """ fp = glob.glob(self.path_aux.format("CLD", detector))[0] return fits.getdata(fp) - def get_flat(self, detector=6): + def get_flat(self, detector=6) -> np.ndarray: + """ get flat data """ fp = glob.glob(self.path_aux.format("CLF", detector))[0] return fits.getdata(fp) @@ -349,7 +353,7 @@ class CsstMsDataManager: dir_pcref = "" else: - raise ValueError("@DM: invalid hostname {}!".format(hostname)) + raise ValueError("@DM: invalid hostname {} or datatype {}!".format(hostname, datatype)) return CsstMsDataManager( ver_sim=ver_sim, datatype=datatype, dir_l0=dir_l0, dir_l1=dir_l1, dir_pcref=dir_pcref, path_aux=path_aux) -- GitLab