From 98579c7c961c9010238452f96de50a4da255d091 Mon Sep 17 00:00:00 2001
From: fangyuedong <fangyuedong@qxslab.cn>
Date: Sun, 7 Apr 2024 18:38:31 +0800
Subject: [PATCH] bug fixes

---
 ObservationSim/Config/ChipOutput.py     | 4 ++--
 ObservationSim/Config/Pointing.py       | 4 ++--
 ObservationSim/MockObject/FlatLED.py    | 6 +++---
 ObservationSim/sim_steps/add_objects.py | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ObservationSim/Config/ChipOutput.py b/ObservationSim/Config/ChipOutput.py
index 64791e8..38862e2 100755
--- a/ObservationSim/Config/ChipOutput.py
+++ b/ObservationSim/Config/ChipOutput.py
@@ -3,7 +3,7 @@ import logging
 import ObservationSim.Config._util as _util
 
 class ChipOutput(object):
-    def __init__(self, config, focal_plane, chip, filt, imgKey0="", imgKey1="", imgKey2="", exptime=150., mjdTime="", ra_cen=None, dec_cen=None, pointing_type='SCI', pointing_ID='0', subdir="./", prefix=""):
+    def __init__(self, config, focal_plane, chip, filt, imgKey0="", imgKey1="", imgKey2="", exptime=150., mjdTime="", ra_cen=None, dec_cen=None, pointing_type='SCIE', pointing_ID='0', subdir="./", prefix=""):
         self.focal_plane = focal_plane
         self.chip = chip
         self.filt = filt
@@ -60,7 +60,7 @@ class ChipOutput(object):
         self.hdr += additional_column_names
     
     def create_output_file(self):
-        if self.pointing_type == 'SCI':
+        if self.pointing_type == 'SCIE':
             self.cat = open(os.path.join(self.subdir, self.cat_name), "w")
             self.logger.info("Creating catalog file %s ...\n"%(os.path.join(self.subdir, self.cat_name)))
             if not self.hdr.endswith("\n"):
diff --git a/ObservationSim/Config/Pointing.py b/ObservationSim/Config/Pointing.py
index 698566e..78b15b9 100644
--- a/ObservationSim/Config/Pointing.py
+++ b/ObservationSim/Config/Pointing.py
@@ -6,7 +6,7 @@ from astropy.time import Time
 import ObservationSim.Instrument._util as _util
 
 class Pointing(object):
-    def __init__(self, id=0, ra=0., dec=0., img_pa=0., timestamp=1621915200, sat_x=0., sat_y=0., sat_z=0., sun_x=0., sun_y=0., sun_z=0., sat_vx=0., sat_vy=0., sat_vz=0., exp_time=150., pointing_type='SCI', obs_config_file=None):
+    def __init__(self, id=0, ra=0., dec=0., img_pa=0., timestamp=1621915200, sat_x=0., sat_y=0., sat_z=0., sun_x=0., sun_y=0., sun_z=0., sat_vx=0., sat_vy=0., sat_vz=0., exp_time=150., pointing_type='SCIE', obs_config_file=None):
         self.id = id
         self.ra = ra
         self.dec = dec
@@ -44,7 +44,7 @@ class Pointing(object):
                     return max(150., self.exp_time) # [TODO] for FGS
 
 
-    def read_pointing_columns(self, columns, id=0, t=1621915200, pointing_type='SCI'):
+    def read_pointing_columns(self, columns, id=0, t=1621915200, pointing_type='SCIE'):
         self.id = id
         col_len = len(columns)
         self.ra = float(columns[0])
diff --git a/ObservationSim/MockObject/FlatLED.py b/ObservationSim/MockObject/FlatLED.py
index 0d4428c..4ce0bc9 100755
--- a/ObservationSim/MockObject/FlatLED.py
+++ b/ObservationSim/MockObject/FlatLED.py
@@ -3,13 +3,13 @@
 import galsim
 import os, sys
 import numpy as np
-from astropy.io import fits
-from scipy.interpolate import griddata
+import time
 import math
 import astropy.constants as cons
+from astropy.io import fits
+from scipy.interpolate import griddata
 from astropy.table import Table
 from ObservationSim.MockObject.SpecDisperser import SpecDisperser
-import time
 from scipy import interpolate
 
 from ObservationSim.MockObject.MockObject import MockObject
diff --git a/ObservationSim/sim_steps/add_objects.py b/ObservationSim/sim_steps/add_objects.py
index 05d96cf..1e89040 100644
--- a/ObservationSim/sim_steps/add_objects.py
+++ b/ObservationSim/sim_steps/add_objects.py
@@ -1,6 +1,7 @@
 import os
 import gc
 import psutil
+import traceback
 import numpy as np
 import galsim
 from ObservationSim._util import get_shear_field
-- 
GitLab