From 5a850797e522b35905e275a2bca77f71ab8eca71 Mon Sep 17 00:00:00 2001 From: yuedong Date: Thu, 19 May 2022 06:56:14 +0800 Subject: [PATCH] mag cut bug fix --- ObservationSim/ObservationSim.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/ObservationSim/ObservationSim.py b/ObservationSim/ObservationSim.py index c382fa6..22cef07 100755 --- a/ObservationSim/ObservationSim.py +++ b/ObservationSim/ObservationSim.py @@ -162,6 +162,15 @@ class Observation(object): chip_output.create_output_file() self.nobj = len(self.cat.objs) + for ifilt in range(len(self.all_filter)): + temp_filter = self.all_filter[ifilt] + # Update the limiting magnitude using exposure time in pointing + temp_filter.update_limit_saturation_mags(exptime=pointing.exp_time, chip=chip) + + # Select cutting band filter for saturation/limiting magnitude + if temp_filter.filter_type.lower() == self.config["obs_setting"]["cut_in_band"].lower(): + cut_filter = temp_filter + # Loop over objects missed_obj = 0 bright_obj = 0 @@ -190,20 +199,12 @@ class Observation(object): target_filt=filt, norm_filt=norm_filt, ) - for ifilt in range(len(self.all_filter)): - temp_filter = self.all_filter[ifilt] - _, obj.param["mag_%s"%temp_filter.filter_type] = self.cat.convert_sed( - mag=obj.param["mag_use_normal"], - sed=sed_data, - target_filt=temp_filter, - norm_filt=norm_filt, - ) - # Update the limiting magnitude using exposure time in pointing - temp_filter.update_limit_saturation_mags(exptime=pointing.exp_time, chip=chip) - - # Select cutting band filter for saturation/limiting magnitude - if temp_filter.filter_type.lower() == self.config["obs_setting"]["cut_in_band"].lower(): - cut_filter = temp_filter + _, obj.param["mag_%s"%cut_filter.filter_type] = self.cat.convert_sed( + mag=obj.param["mag_use_normal"], + sed=sed_data, + target_filt=cut_filter, + norm_filt=norm_filt, + ) except Exception as e: print(e) -- GitLab