diff --git a/measurement_pipeline/L1_pipeline/csst_msc_instrument/csst_msc_mbi_instrument.py b/measurement_pipeline/L1_pipeline/csst_msc_instrument/csst_msc_mbi_instrument.py index 3c99ca90b980ffe1737d78ecb6eb94d06ceba825..a3cca89b46d458c4df68fb6ef336a19ab47208ab 100644 --- a/measurement_pipeline/L1_pipeline/csst_msc_instrument/csst_msc_mbi_instrument.py +++ b/measurement_pipeline/L1_pipeline/csst_msc_instrument/csst_msc_mbi_instrument.py @@ -11,7 +11,7 @@ Modified-History: from datetime import datetime from typing import Optional -import csst_common +# import csst_common import numpy as np from itertools import product from astropy.io import fits @@ -23,7 +23,7 @@ from astropy.stats import sigma_clipped_stats # subtract_dark, # FlagConfig, # ) -from csst_msc_instrument.image import ( +from L1_pipeline.csst_msc_instrument.image import ( subtract_bias, subtract_dark, FlagConfig, @@ -46,7 +46,7 @@ def core_msc_l1_mbi_instrument( config_ccd_info: Optional[str] = None, config_bad_pixel: Optional[str] = None, device: Optional[str] = "CPU", -) #-> CsstResult: +): #-> CsstResult: """ Make the instrument correction for one chip of CSST data. diff --git a/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/__init__.py b/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/__init__.py index 3dd853fee9d1f387bc6635046548c17cbbcce38d..4778ca20b49ad1b4f2adab5881da155b750dfa3e 100644 --- a/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/__init__.py +++ b/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/__init__.py @@ -13,5 +13,8 @@ from .basic import subtract_bias, subtract_dark from .crosstalk import remove_crosstalk from .gain import apply_gain from .overscan import correct_overscan +from .config import FlagConfig, CameraConfig, CCDArrayConfig, get_array_config +from .format import convert_format -__all__ = ['correct_overscan', 'apply_gain', 'subtract_bias', 'remove_crosstalk', 'subtract_dark', ] \ No newline at end of file +__all__ = ['correct_overscan', 'apply_gain', 'subtract_bias', 'remove_crosstalk', 'subtract_dark', +'FlagConfig', 'CameraConfig', 'CCDArrayConfig', 'get_array_config','convert_format', ] \ No newline at end of file diff --git a/measurement_pipeline/L1_pipeline/csst_msc_instrument/config.py b/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/config.py similarity index 100% rename from measurement_pipeline/L1_pipeline/csst_msc_instrument/config.py rename to measurement_pipeline/L1_pipeline/csst_msc_instrument/image/config.py diff --git a/measurement_pipeline/L1_pipeline/csst_msc_instrument/format.py b/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/format.py similarity index 100% rename from measurement_pipeline/L1_pipeline/csst_msc_instrument/format.py rename to measurement_pipeline/L1_pipeline/csst_msc_instrument/image/format.py diff --git a/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/gain.py b/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/gain.py index 1b00b65e142401957159c9bbbeab5fb239e3dfbe..fd7c4ba4941e5b28c589a700b4f76b84dc4718ba 100644 --- a/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/gain.py +++ b/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/gain.py @@ -11,7 +11,7 @@ Modified-History: import numpy as np -from ..config import get_array_config +from .config import get_array_config __all__ = ['apply_gain', 'make_gainmap_from_channel_value', ] diff --git a/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/overscan.py b/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/overscan.py index 5ffa4500a3fe5c2b20248b20319cbb42807d206e..b2843b98af809af89ef4d32b7f511e03d4e52b3b 100644 --- a/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/overscan.py +++ b/measurement_pipeline/L1_pipeline/csst_msc_instrument/image/overscan.py @@ -18,7 +18,7 @@ from scipy.special import erf from scipy.stats import trim_mean, t, sigmaclip from astropy.stats import mad_std, sigma_clip -from ..config import get_array_config +from .config import get_array_config __all__ = ["average_overscan", "smooth_overscan", "correct_overscan", ] diff --git a/measurement_pipeline/run_csst_msc_instrument.py b/measurement_pipeline/run_csst_msc_instrument.py new file mode 100644 index 0000000000000000000000000000000000000000..48784cf4344955c63705eda946ae7b78e733169d --- /dev/null +++ b/measurement_pipeline/run_csst_msc_instrument.py @@ -0,0 +1,11 @@ +from L1_pipeline.csst_msc_instrument.csst_msc_mbi_instrument import core_msc_l1_mbi_instrument +# core_msc_l1_mbi_instrument( +# image_path=r"D:\Zhou\Desktop\data\data_09.fits", +# bias_path=r"D:\Zhou\Desktop\data\bias_09.fits", +# dark_path=r"D:\Zhou\Desktop\data\dark_09.fits", +# flat_path=r"D:\Zhou\Desktop\data\flat_09.fits", +# shutter_path=r"D:\Zhou\Desktop\data\csst_msc_ms_shutter_09_000001.fits", +# image_output_path=r"D:\Zhou\Desktop\data\result\image_test_output.fits", +# weight_output_path=r"D:\Zhou\Desktop\data\result\weight_test_output.fits", +# flag_output_path=r"D:\Zhou\Desktop\data\result\flag_test_output.fits", +# ) \ No newline at end of file