diff --git a/ObservationSim/Config/Header/ImageHeader.py b/ObservationSim/Config/Header/ImageHeader.py index 3566a8da7be92c744ee83794b98efcc809c818d3..1de7dc98e01c5354dc7d24d935dd042cbb33b1f2 100644 --- a/ObservationSim/Config/Header/ImageHeader.py +++ b/ObservationSim/Config/Header/ImageHeader.py @@ -419,7 +419,10 @@ def generatePrimaryHeader(xlen = 9216, ylen = 9232, pointing_id = '00000001', po ra_hms = format(co.ra.hms.h, '02.0f') + format(co.ra.hms.m, '02.0f') + format(co.ra.hms.s, '02.1f') dec_hms = format(co.dec.dms.d, '02.0f') + format(abs(co.dec.dms.m), '02.0f') + format(abs(co.dec.dms.s), '02.0f') - h_prim['TARGET'] = ra_hms + '+' + dec_hms + if dec > 0: + h_prim['TARGET'] = ra_hms + '+' + dec_hms + else: + h_prim['TARGET'] = ra_hms + dec_hms # # h_prim['RA_NOM'] = ra_hms # h_prim['DEC_NOM'] = dec_hms diff --git a/ObservationSim/MockObject/FlatLED.py b/ObservationSim/MockObject/FlatLED.py index 8c517cda98e9c0eea51f5fddf130b810fabc5dcf..37fbf6dfda12e5ade2e104a772299d1c0948ed1e 100755 --- a/ObservationSim/MockObject/FlatLED.py +++ b/ObservationSim/MockObject/FlatLED.py @@ -106,6 +106,11 @@ class FlatLED(object): return np.ones([self.chip.npix_y,self.chip.npix_x]) ledFlat = np.zeros([self.chip.npix_y,self.chip.npix_x]) + + ledStat = '00000000000000' + ledTimes = [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0] + + nledStat = '2' for i in np.arange(len(led_type_list)): led_type = led_type_list[i] exp_t = exp_t_list[i] @@ -126,7 +131,10 @@ class FlatLED(object): unitFlatImg = unitFlatImg * t_spec # print("DEBUG1:---------------",np.mean(unitFlatImg)) ledFlat = ledFlat+unitFlatImg*exp_t - return ledFlat + + ledStat = ledStat[0:int(led_type[3:])-1]+nledStat+ledStat[int(led_type[3:]):] + ledTimes[int(led_type[3:])-1] = exp_t * 1000 + return ledFlat, ledStat, ledTimes def drawObj_LEDFlat_slitless(self, led_type_list=['LED1'], exp_t_list=[0.1]): if len(led_type_list) != len(exp_t_list): @@ -154,8 +162,9 @@ class FlatLED(object): flat_cube=self.chip.flat_cube, led_spec=led_spec) ledFlat = ledFlat + ledspec_map - - return ledFlat + ledStat = ledStat[0:int(led_type[3:])-1]+nledStat+ledStat[int(led_type[3:]):] + ledTimes[int(led_type[3:])-1] = exp_t * 1000 + return ledFlat, ledStat, ledTimes def drawObj_LEDFlat(self, led_type_list=['LED1'], exp_t_list=[0.1]): if self.chip.survey_type == "photometric": diff --git a/ObservationSim/sim_steps/add_LED_flat.py b/ObservationSim/sim_steps/add_LED_flat.py index eaeda9b49ec934e5cad143eb53ae193dc6080e57..bacfab4b9b4617bea33d5d335f46329dd4c75bda 100644 --- a/ObservationSim/sim_steps/add_LED_flat.py +++ b/ObservationSim/sim_steps/add_LED_flat.py @@ -13,8 +13,10 @@ def add_LED_Flat(self, chip, filt, tel, pointing, catalog, obs_param): print("LED OPEN--------") led_obj = FlatLED(chip, filt) - led_flat = led_obj.drawObj_LEDFlat(led_type_list=obs_param["LED_TYPE"], exp_t_list=obs_param["LED_TIME"]) + led_flat, ledstat, letts = led_obj.drawObj_LEDFlat(led_type_list=obs_param["LED_TYPE"], exp_t_list=obs_param["LED_TIME"]) pf_map = led_flat + self.updateHeaderInfo(header_flag='ext', keys = ['LEDSTAT'], values = [ledstat]) + self.updateHeaderInfo(header_flag='ext', keys = ['LEDT01','LEDT02','LEDT03','LEDT04','LEDT05','LEDT06','LEDT07','LEDT08','LEDT09','LEDT10','LEDT11','LEDT12','LEDT13','LEDT14'], values = letts) if obs_param["shutter_effect"] == True: pf_map = pf_map * chip.shutter_img diff --git a/config/obs_config_Calibration_BIAS.yaml b/config/obs_config_Calibration_BIAS.yaml index ae4f164cc4ef7ce7dc6013ebda4053592c8b8ed7..384c74415a331ef168e76ac198783a65af3119c6 100644 --- a/config/obs_config_Calibration_BIAS.yaml +++ b/config/obs_config_Calibration_BIAS.yaml @@ -61,7 +61,8 @@ call_sequence: # # Run CTE simulation CTE_effect: {} # Add prescan and overscan - prescan_overscan: {} + prescan_overscan: + add_dark: YES # Add bias bias: bias_16channel: YES @@ -72,5 +73,5 @@ call_sequence: gain_16channel: YES # Output the final image quantization_and_output: - format_output: NO + format_output: YES ... \ No newline at end of file diff --git a/config/obs_config_Calibration_FLAT.yaml b/config/obs_config_Calibration_FLAT.yaml index 54e9465782f5e62d41cbac13405968eddabc4e7e..e5546276ab5d052263ffedd1745174e627b417e9 100644 --- a/config/obs_config_Calibration_FLAT.yaml +++ b/config/obs_config_Calibration_FLAT.yaml @@ -61,7 +61,8 @@ call_sequence: # # Run CTE simulation CTE_effect: {} # Add prescan and overscan - prescan_overscan: {} + prescan_overscan: + add_dark: YES # Add bias bias: bias_16channel: YES @@ -72,5 +73,5 @@ call_sequence: gain_16channel: YES # Output the final image quantization_and_output: - format_output: NO + format_output: YES ... \ No newline at end of file