From bfc2ab16b15cb8a9b50a19cb8308f10c65c47d7f Mon Sep 17 00:00:00 2001 From: Bo Zhang Date: Wed, 13 Apr 2022 21:55:37 +0800 Subject: [PATCH] tweaks --- csst/msc/instrument.py | 4 ++-- csst/msc/pipeline.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/csst/msc/instrument.py b/csst/msc/instrument.py index 82025b9..c42bcff 100644 --- a/csst/msc/instrument.py +++ b/csst/msc/instrument.py @@ -167,8 +167,8 @@ class CsstMscInstrumentProc(CsstProcessor): wht = raw.deepcopy(name="WHT", data=self.__wht) flg = raw.deepcopy(name="FLG", data=self.__flg) img.set_keyword("FILENAME", img.get_keyword("FILENAME", hdu=0).replace("_raw", "_img"), hdu=0) - wht.set_keyword("FILENAME", wht.get_keyword("FILENAME", hdu=0).replace("_raw", "_img"), hdu=0) - flg.set_keyword("FILENAME", flg.get_keyword("FILENAME", hdu=0).replace("_raw", "_img"), hdu=0) + wht.set_keyword("FILENAME", wht.get_keyword("FILENAME", hdu=0).replace("_raw", "_wht"), hdu=0) + flg.set_keyword("FILENAME", flg.get_keyword("FILENAME", hdu=0).replace("_raw", "_flg"), hdu=0) return img, wht, flg diff --git a/csst/msc/pipeline.py b/csst/msc/pipeline.py index 430d7d7..9af7955 100644 --- a/csst/msc/pipeline.py +++ b/csst/msc/pipeline.py @@ -22,6 +22,8 @@ from csst.msc.instrument import CsstMscInstrumentProc # from astropy.io import fits for i_ccd in range(6, 26): + if i_ccd in [10, 21]: + continue # i_ccd = 6 print("processing CCD {}".format(i_ccd)) fp_raw = glob.glob("{}/MSC_MS_*{:02}_raw.fits".format(DIR_TEST, i_ccd)) @@ -29,6 +31,7 @@ for i_ccd in range(6, 26): fp_raw = fp_raw[0] raw = CsstMscImgData.read(fp_raw) + # in future, get_* functions grab bias = raw.get_bias(PATH_BIAS.format(i_ccd)) dark = raw.get_dark(PATH_DARK.format(i_ccd)) flat = raw.get_flat(PATH_FLAT.format(i_ccd)) -- GitLab