From 4e22886f387b1d9ce2cdf9796a315ad8d9b05a0d Mon Sep 17 00:00:00 2001 From: Zhang Xin Date: Tue, 4 Jul 2023 11:45:06 +0800 Subject: [PATCH] add whether use straylight model --- ObservationSim/Instrument/Filter.py | 2 ++ ObservationSim/ObservationSim.py | 5 +++-- config/config_C6.yaml | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ObservationSim/Instrument/Filter.py b/ObservationSim/Instrument/Filter.py index d024169..7127dc7 100755 --- a/ObservationSim/Instrument/Filter.py +++ b/ObservationSim/Instrument/Filter.py @@ -25,6 +25,7 @@ class Filter(object): self.bandpass_full, self.bandpass_sub_list = self._get_bandpasses() self.survey_type = self._getSurveyType() + def _getSurveyType(self): if self.filter_type in ["GI", "GV", "GU"]: return "spectroscopic" @@ -40,6 +41,7 @@ class Filter(object): self.sky_background = filter_param.param[filter_type][5] self.mag_saturation = filter_param.param[filter_type][6] self.mag_limiting = filter_param.param[filter_type][7] + self.zodical_spec = None def is_too_bright(self, mag, margin=-2.5): return mag <= self.mag_saturation + margin diff --git a/ObservationSim/ObservationSim.py b/ObservationSim/ObservationSim.py index da3e9f1..0822789 100755 --- a/ObservationSim/ObservationSim.py +++ b/ObservationSim/ObservationSim.py @@ -108,9 +108,10 @@ class Observation(object): chip.img.setOrigin(chip.bound.xmin, chip.bound.ymin) chip.img.wcs = wcs_fp - filt.setFilterStrayLightPixel(jtime = pointing.jdt, sat_pos = np.array([pointing.sat_x, pointing.sat_y, pointing.sat_z]), pointing_radec = np.array([pointing.ra,pointing.dec]), sun_pos = np.array([pointing.sun_x,pointing.sun_y,pointing.sun_z])) + if self.config["obs_setting"]["enable_straylight_model"]: + filt.setFilterStrayLightPixel(jtime = pointing.jdt, sat_pos = np.array([pointing.sat_x, pointing.sat_y, pointing.sat_z]), pointing_radec = np.array([pointing.ra,pointing.dec]), sun_pos = np.array([pointing.sun_x,pointing.sun_y,pointing.sun_z])) - print("========================sky pix========================\n") + print("========================sky pix========================") print(filt.sky_background) if chip.survey_type == "photometric": diff --git a/config/config_C6.yaml b/config/config_C6.yaml index ff0e202..087de4f 100644 --- a/config/config_C6.yaml +++ b/config/config_C6.yaml @@ -105,6 +105,9 @@ obs_setting: # Whether to enable astrometric modeling enable_astrometric_model: True + # Whether to enable straylight model + enable_straylight_model: False + # Cut by saturation magnitude in which band? cut_in_band: "z" -- GitLab