Merge branch 'wcs_test' into 'develop'

starting point of the new version

See merge request csst_sim/csst-simulation!15

Catalog/C6_Catalog.py

@@ -83,7 +83,7 @@ class Catalog(CatalogBase):
             self._load_SED_lib_AGN()
 
         if "rotateEll" in config["catalog_options"]:
-            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))
+            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))
         else:
             self.rotation = 0.
 
@@ -259,7 +259,7 @@ class Catalog(CatalogBase):
             param['id'] = '%06d'%(int(pix_id)) + '%06d'%(cat_id) + '%08d'%(igals)
             
             if param['star'] == 0:
-                obj = Galaxy(param, self.rotation, logger=self.logger)
+                obj = Galaxy(param, logger=self.logger)
             
             # Need to deal with additional output columns
             obj.additional_output_str = self.add_fmt%("n", 0., 0., 0.,

Catalog/C6_fits_Catalog.py

@@ -94,7 +94,7 @@ class Catalog(CatalogBase):
         ###mock_stamp_END
         
         if "rotateEll" in config["catalog_options"]:
-            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))
+            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))
         else:
             self.rotation = 0.
 
@@ -272,7 +272,7 @@ class Catalog(CatalogBase):
             param['id'] = '%06d'%(int(pix_id)) + '%06d'%(cat_id) + '%08d'%(igals)
             
             if param['star'] == 0:
-                obj = Galaxy(param, self.rotation, logger=self.logger)
+                obj = Galaxy(param, logger=self.logger)
             
             # Need to deal with additional output columns
             obj.additional_output_str = self.add_fmt%("n", 0., 0., 0.,

Catalog/FGS_Catalog.py

@@ -84,7 +84,7 @@ class Catalog(CatalogBase):
             self._load_SED_lib_AGN()
 
         if "rotateEll" in config["catalog_options"]:
-            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))
+            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))
         else:
             self.rotation = 0.
 
@@ -260,7 +260,7 @@ class Catalog(CatalogBase):
             param['id'] = '%06d'%(int(pix_id)) + '%06d'%(cat_id) + '%08d'%(igals)
             
             if param['star'] == 0:
-                obj = Galaxy(param, self.rotation, logger=self.logger)
+                obj = Galaxy(param, logger=self.logger)
             
             # Need to deal with additional output columns
             obj.additional_output_str = self.add_fmt%("n", 0., 0., 0.,

Catalog/NGPCatalog.py

@@ -52,7 +52,7 @@ class Catalog(CatalogBase):
             self.galaxy_SED_path = os.path.join(config["data_dir"], config["catalog_options"]["SED_templates_path"]["galaxy_SED"])
             self._load_SED_lib_gals()
         if "rotateEll" in config["catalog_options"]:
-            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))
+            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))
         else:
             self.rotation = 0.
 
@@ -191,7 +191,7 @@ class Catalog(CatalogBase):
             param['id'] = gals['galaxyID'][igals]
             
             if param['star'] == 0:
-                obj = Galaxy(param, self.rotation, logger=self.logger)
+                obj = Galaxy(param, logger=self.logger)
             if param['star'] == 2:
                 obj = Quasar(param, logger=self.logger)
             

Catalog/testCat_galaxy.py

@@ -81,7 +81,7 @@ class Catalog(CatalogBase):
             self._load_SED_lib_AGN()
 
         if "rotateEll" in config["catalog_options"]:
-            self.rotation = float(int(config["catalog_options"]["rotateEll"]/45.))
+            self.rotation = np.radians(float(config["catalog_options"]["rotateEll"]))
         else:
             self.rotation = 0.
 
@@ -253,7 +253,7 @@ class Catalog(CatalogBase):
             param['id'] = '%06d'%(int(pix_id)) + '%06d'%(cat_id) + '%08d'%(igals)
             
             if param['star'] == 0:
-                obj = Galaxy(param, self.rotation, logger=self.logger)
+                obj = Galaxy(param, logger=self.logger)
             
             # Need to deal with additional output columns
             obj.additional_output_str = self.add_fmt%("n", 0., 0., 0.,

ObservationSim/Config/Header/ImageHeader.py

@@ -291,7 +291,8 @@ def WCS_def(xlen = 9216, ylen = 9232, gapy = 898.0, gapx1 = 534, gapx2 = 1309, r
         r_dat['CRPIX1'] = -x1
         r_dat['CRPIX2'] = -y1
 
-        cd = np.array([[ pixel_scale,  0], [0, pixel_scale]])/3600.*flag_x[1]
+        # cd = np.array([[ pixel_scale,  0], [0, pixel_scale]])/3600.*flag_x[1]
+        cd = np.array([[ pixel_scale,  0], [0, -pixel_scale]])/3600.
         cd_rot = rotate_CD_matrix(cd, pa_aper)
         r_dat['CD1_1'] = cd_rot[0,0]
         r_dat['CD1_2'] = cd_rot[0,1]

ObservationSim/Instrument/Chip/Chip.py

@@ -77,7 +77,8 @@ class Chip(FocalPlane):
                 self.fdModel = None
             else:
                 try:
-                    with pkg_resources.files('ObservationSim.Instrument.data.field_distortion').joinpath("FieldDistModelGlobal_mainFP_v1.0.pickle") as field_distortion:
+                    # with pkg_resources.files('ObservationSim.Instrument.data.field_distortion').joinpath("FieldDistModelGlobal_mainFP_v1.0.pickle") as field_distortion:
+                    with pkg_resources.files('ObservationSim.Instrument.data.field_distortion').joinpath("FieldDistModel_v2.0.pickle") as field_distortion:
                         with open(field_distortion, "rb") as f:
                             self.fdModel = pickle.load(f)
                 except AttributeError:
@@ -117,7 +118,7 @@ class Chip(FocalPlane):
         self._getCRdata()
 
         # Define the sensor model
-        if config["ins_effects"]["bright_fatter"] == True and self.survey_type == "photometric":
+        if "bright_fatter" in config["ins_effects"] and config["ins_effects"]["bright_fatter"] == True and self.survey_type == "photometric":
             self.sensor = galsim.SiliconSensor(strength=self.df_strength, treering_func=treering_func)
         else:
             self.sensor = galsim.Sensor()
@@ -146,18 +147,18 @@ class Chip(FocalPlane):
     def _getSurveyType(self):
         if self.filter_type in ["GI", "GV", "GU"]:
             return "spectroscopic"
-        elif self.filter_type in ["nuv", "u", "g", 'r', 'i', 'z', 'y', 'FGS']:
+        elif self.filter_type in ["NUV", "u", "g", 'r', 'i', 'z', 'y', 'FGS']:
             return "photometric"
         # elif self.filter_type in ["FGS"]:
         #     return "FGS"
 
     def _getChipEffCurve(self, filter_type):
         # CCD efficiency curves
-        if filter_type in ['nuv', 'u', 'GU']: filename = 'UV0.txt'
+        if filter_type in ['NUV', 'u', 'GU']: filename = 'UV0.txt'
         if filter_type in ['g', 'r', 'GV', 'FGS']: filename = 'Astro_MB.txt' # TODO, need to switch to the right efficiency curvey for FGS CMOS
         if filter_type in ['i', 'z', 'y', 'GI']: filename = 'Basic_NIR.txt'
         # Mirror efficiency:
-        # if filter_type == 'nuv': mirror_eff = 0.54
+        # if filter_type == 'NUV': mirror_eff = 0.54
         # if filter_type == 'u': mirror_eff = 0.68
         # if filter_type in ['g', 'r', 'i', 'z', 'y']: mirror_eff = 0.8
         # if filter_type in ['GU', 'GV', 'GI']: mirror_eff = 1. # Not sure if this is right
@@ -184,7 +185,7 @@ class Chip(FocalPlane):
     def getChipFilter(self, chipID=None, filter_layout=None):
         """Return the filter index and type for a given chip #(chipID)
         """
-        filter_type_list = ["nuv","u", "g", "r", "i","z","y","GU", "GV", "GI", "FGS"]
+        filter_type_list = ["NUV","u", "g", "r", "i","z","y","GU", "GV", "GI", "FGS"]
         if filter_layout is not None:
             return filter_layout[chipID][0], filter_layout[chipID][1]
         if chipID == None:
@@ -197,7 +198,7 @@ class Chip(FocalPlane):
         if chipID in [7, 24]:          filter_type = "i"
         if chipID in [14, 17]:         filter_type = "u"
         if chipID in [9, 22]:          filter_type = "r"
-        if chipID in [12, 13, 18, 19]: filter_type = "nuv"
+        if chipID in [12, 13, 18, 19]: filter_type = "NUV"
         if chipID in [8, 23]:          filter_type = "g"
         if chipID in [1, 10, 21, 30]:  filter_type = "GI"
         if chipID in [2, 5, 26, 29]:   filter_type = "GV"
@@ -514,21 +515,6 @@ class Chip(FocalPlane):
         if config["ins_effects"]["add_badcolumns"] == True:
             img = effects.BadColumns(img, seed=SeedBadColumns, chipid=self.chipID, logger=self.logger)
 
-        # Add Bias level
-        if config["ins_effects"]["add_bias"] == True:
-            if self.logger is not None:
-                self.logger.info("  Adding Bias level and 16-channel non-uniformity")
-            else:
-                print("  Adding Bias level and 16-channel non-uniformity")
-            if config["ins_effects"]["bias_16channel"] == True:
-                img = effects.AddBiasNonUniform16(img, 
-                    bias_level=float(self.bias_level), 
-                    nsecy = 2, nsecx=8, 
-                    seed=SeedBiasNonuni+self.chipID,
-                    logger=self.logger)
-            elif config["ins_effects"]["bias_16channel"] == False:
-                img += self.bias_level
-
         # Apply Nonlinearity on the chip image
         if config["ins_effects"]["non_linear"] == True:
             if self.logger is not None:
@@ -552,6 +538,21 @@ class Chip(FocalPlane):
             else:
                 print("  Apply CTE Effect")
             img = effects.CTE_Effect(GSImage=img, threshold=27)
+        
+        # Add Bias level
+        if config["ins_effects"]["add_bias"] == True:
+            if self.logger is not None:
+                self.logger.info("  Adding Bias level and 16-channel non-uniformity")
+            else:
+                print("  Adding Bias level and 16-channel non-uniformity")
+            if config["ins_effects"]["bias_16channel"] == True:
+                img = effects.AddBiasNonUniform16(img, 
+                    bias_level=float(self.bias_level), 
+                    nsecy = 2, nsecx=8, 
+                    seed=SeedBiasNonuni+self.chipID,
+                    logger=self.logger)
+            elif config["ins_effects"]["bias_16channel"] == False:
+                img += self.bias_level
 
         # Add Read-out Noise
         if config["ins_effects"]["add_readout"] == True:

ObservationSim/Instrument/FilterParam.py

@@ -26,7 +26,7 @@ class FilterParam(object):
         # 8) dim end magnitude
         if filter_param == None:
             filtP = {
-                    "nuv":   [2867.7,   705.4,  2470.0,   3270.0,  0.1404, 0.004, 15.7, 25.4],
+                    "NUV":   [2867.7,   705.4,  2470.0,   3270.0,  0.1404, 0.004, 15.7, 25.4],
                     "u":     [3601.1,   852.1,  3120.0,   4090.0,  0.2176, 0.021, 16.1, 25.4],
                     "g":     [4754.5,  1569.8,  3900.0,   5620.0,  0.4640, 0.164, 17.2, 26.3],
                     "r":     [6199.8,  1481.2,  5370.0,   7030.0,  0.5040, 0.207, 17.0, 26.0],

ObservationSim/Instrument/FocalPlane.py

@@ -86,15 +86,16 @@ class FocalPlane(object):
         if (xcen == None) or (ycen == None):
             xcen = self.cen_pix_x
             ycen = self.cen_pix_y
+        # dudx =  -np.cos(img_rot.rad) * pix_scale
+        # dudy =  -np.sin(img_rot.rad) * pix_scale
+        # dvdx =  -np.sin(img_rot.rad) * pix_scale
+        # dvdy =  +np.cos(img_rot.rad) * pix_scale
+
         dudx =  -np.cos(img_rot.rad) * pix_scale
-        dudy =  -np.sin(img_rot.rad) * pix_scale
+        dudy =  +np.sin(img_rot.rad) * pix_scale
         dvdx =  -np.sin(img_rot.rad) * pix_scale
-        dvdy =  +np.cos(img_rot.rad) * pix_scale
+        dvdy =  -np.cos(img_rot.rad) * pix_scale
         
-        # dudx =  +np.sin(img_rot.rad) * pix_scale
-        # dudy =  +np.cos(img_rot.rad) * pix_scale
-        # dvdx =  -np.cos(img_rot.rad) * pix_scale
-        # dvdy =  +np.sin(img_rot.rad) * pix_scale
         moscen = galsim.PositionD(x=xcen, y=ycen)
         sky_center = galsim.CelestialCoord(ra=ra*galsim.degrees, dec=dec*galsim.degrees)
         affine = galsim.AffineTransform(dudx, dudy, dvdx, dvdy, origin=moscen)

ObservationSim/MockObject/CatalogBase.py

 import numpy as np
 import galsim
 import copy
+import cmath
 
 from astropy.table import Table
 from abc import abstractmethod, ABCMeta
@@ -72,6 +73,16 @@ class CatalogBase(metaclass=ABCMeta):
             "parallax":1e-9
         }
         return param
+
+    @staticmethod
+    def rotate_ellipticity(e1, e2, rotation=0., unit='radians'):
+        if unit == 'degree':
+            rotation = np.radians(rotation)
+        e_total = np.sqrt(e1**2 + e2**2)
+        phi = cmath.phase(complex(e1, e2))
+        e1 = e_total * np.cos(phi + 2*rotation)
+        e2 = e_total * np.sin(phi + 2*rotation)
+        return e1, e2, e_total
     
     @staticmethod
     def convert_sed(mag, sed, target_filt, norm_filt=None):

ObservationSim/MockObject/Galaxy.py

@@ -12,7 +12,7 @@ from ObservationSim.MockObject.MockObject import MockObject
 # import tracemalloc
 
 class Galaxy(MockObject):
-    def __init__(self, param, rotation=None, logger=None):
+    def __init__(self, param, logger=None):
         super().__init__(param, logger=logger)
         # self.thetaR = self.param["theta"]
         # self.bfrac = self.param["bfrac"]
@@ -27,8 +27,6 @@ class Galaxy(MockObject):
         # self.e1_bulge, self.e2_bulge = self.e_bulge.g1, self.e_bulge.g2
         # self.e1_total, self.e2_total = self.e_total.g1, self.e_total.g2
 
-        if rotation is not None:
-            self.rotateEllipticity(rotation)
         if not hasattr(self, "disk_sersic_idx"):
             self.disk_sersic_idx = 1.
         if not hasattr(self, "bulge_sersic_idx"):
@@ -51,7 +49,8 @@ class Galaxy(MockObject):
             full = integrate_sed_bandpass(sed=self.sed, bandpass=filt.bandpass_full)
         except Exception as e:
             print(e)
-            self.logger.error(e)
+            if self.logger:
+                self.logger.error(e)
             return -1
         for i in range(len(bandpass_list)):
             bandpass = bandpass_list[i]
@@ -59,7 +58,8 @@ class Galaxy(MockObject):
                 sub = integrate_sed_bandpass(sed=self.sed, bandpass=bandpass)
             except Exception as e:
                 print(e)
-                self.logger.error(e)
+                if self.logger:
+                    self.logger.error(e)
                 return -1
             
             ratio = sub/full
@@ -78,12 +78,13 @@ class Galaxy(MockObject):
 
             gal = self.bfrac * bulge + (1.0 - self.bfrac) * disk
             gal = gal.withFlux(nphotons)
+            if fd_shear is not None:
+                g1 += fd_shear.g1
+                g2 += fd_shear.g2
             gal_shear = galsim.Shear(g1=g1, g2=g2)
             gal = gal.shear(gal_shear)
             gal = galsim.Convolve(psf, gal)
             
-            if fd_shear is not None:
-                gal = gal.shear(fd_shear)
             objs.append(gal)
         final = galsim.Sum(objs)
         return final
@@ -97,7 +98,8 @@ class Galaxy(MockObject):
             full = integrate_sed_bandpass(sed=self.sed, bandpass=filt.bandpass_full)
         except Exception as e:
             print(e)
-            self.logger.error(e)
+            if self.logger:
+                self.logger.error(e)
             return 2, None
 
         nphotons_sum = 0
@@ -131,6 +133,18 @@ class Galaxy(MockObject):
 
         real_wcs_local = self.real_wcs.local(self.real_pos)
 
+        disk = galsim.Sersic(n=self.disk_sersic_idx, half_light_radius=self.hlr_disk, flux=1.0, gsparams=gsp)
+        disk_shape = galsim.Shear(g1=self.e1_disk, g2=self.e2_disk)
+        disk = disk.shear(disk_shape)
+        bulge = galsim.Sersic(n=self.bulge_sersic_idx, half_light_radius=self.hlr_bulge, flux=1.0, gsparams=gsp)
+        bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)
+        bulge = bulge.shear(bulge_shape)
+        
+        if fd_shear:
+            g1 += fd_shear.g1
+            g2 += fd_shear.g2
+        gal_shear = galsim.Shear(g1=g1, g2=g2)
+
         for i in range(len(bandpass_list)):
             bandpass = bandpass_list[i]
 
@@ -138,7 +152,8 @@ class Galaxy(MockObject):
                 sub = integrate_sed_bandpass(sed=self.sed, bandpass=bandpass)
             except Exception as e:
                 print(e)
-                self.logger.error(e)
+                if self.logger:
+                    self.logger.error(e)
                 # return False
                 continue
             
@@ -153,41 +168,24 @@ class Galaxy(MockObject):
             # print("nphotons_sub-band_%d = %.2f"%(i, nphotons))
 
             psf, pos_shear = psf_model.get_PSF(chip=chip, pos_img=pos_img, bandpass=bandpass, folding_threshold=folding_threshold)
-            disk = galsim.Sersic(n=self.disk_sersic_idx, half_light_radius=self.hlr_disk, flux=1.0, gsparams=gsp)
-            disk_shape = galsim.Shear(g1=self.e1_disk, g2=self.e2_disk)
-            disk = disk.shear(disk_shape)
-            bulge = galsim.Sersic(n=self.bulge_sersic_idx, half_light_radius=self.hlr_bulge, flux=1.0, gsparams=gsp)
-            bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)
-            bulge = bulge.shear(bulge_shape)
+            
+            gal_temp = self.bfrac * bulge + (1.0 - self.bfrac) * disk
+            gal_temp = gal_temp.shear(gal_shear)
 
-            gal = self.bfrac * bulge + (1.0 - self.bfrac) * disk
+            gal_temp = gal_temp.withFlux(nphotons)
+            if not big_galaxy: # Not apply PSF for very big galaxy
+                gal_temp = galsim.Convolve(psf, gal_temp)
+            
+            if i == 0:
+                gal = gal_temp
+            else:
+                gal = gal + gal_temp
 
             # (TEST) Random knots
             # knots = galsim.RandomKnots(npoints=100, profile=disk)
             # kfrac = np.random.random()*(1.0 - self.bfrac)
             # gal = self.bfrac * bulge + (1.0 - self.bfrac - kfrac) * disk + kfrac * knots
 
-            gal = gal.withFlux(nphotons)
-            gal_shear = galsim.Shear(g1=g1, g2=g2)
-            gal = gal.shear(gal_shear)
-
-            if not big_galaxy: # Not apply PSF for very big galaxy
-                gal = galsim.Convolve(psf, gal)
-                if fd_shear is not None:
-                    gal = gal.shear(fd_shear)
-
-            # Use (explicit) stamps to draw
-            stamp = gal.drawImage(wcs=real_wcs_local, method='phot', offset=offset, save_photons=True)
-            
-            xmax = max(xmax, stamp.xmax - stamp.xmin)
-            ymax = max(ymax, stamp.ymax - stamp.ymin)
-
-            photons = stamp.photons
-            photons.x += x_nominal
-            photons.y += y_nominal
-            photons_list.append(photons)
-            del gal
-
         # # [C6 TEST]
         # print('xmax = %d, ymax = %d '%(xmax, ymax))
         # # Output memory usage
@@ -196,7 +194,12 @@ class Galaxy(MockObject):
         # for stat in top_stats[:10]:
         #     print(stat)
 
-        stamp = galsim.ImageF(int(xmax * 1.1), int(ymax * 1.1))
+        stamp = gal.drawImage(wcs=real_wcs_local, method='phot', offset=offset, save_photons=True)
+        photons = stamp.photons
+        photons.x += x_nominal
+        photons.y += y_nominal
+        photons_list.append(photons)
+
         stamp.wcs = real_wcs_local
         stamp.setCenter(x_nominal, y_nominal)
         bounds = stamp.bounds & galsim.BoundsI(0, chip.npix_x - 1, 0, chip.npix_y - 1)
@@ -226,7 +229,8 @@ class Galaxy(MockObject):
         else:
             # Return code 0: object photons missed this detector
             print("obj %s missed"%(self.id))
-            self.logger.info("obj %s missed"%(self.id))
+            if self.logger:
+                self.logger.info("obj %s missed"%(self.id))
             return 0, pos_shear
         
         # # [C6 TEST]
@@ -297,14 +301,17 @@ class Galaxy(MockObject):
             # gal = self.bfrac * bulge + (1.0 - self.bfrac - kfrac) * disk + kfrac * knots
 
             gal = gal.withFlux(tel.pupil_area * exptime)
+            if fd_shear:
+                g1 += fd_shear.g1
+                g2 += fd_shear.g2
             gal_shear = galsim.Shear(g1=g1, g2=g2)
             gal = gal.shear(gal_shear)
             gal = galsim.Convolve(psf, gal)
 
             if not big_galaxy: # Not apply PSF for very big galaxy
                 gal = galsim.Convolve(psf, gal)
-                if fd_shear is not None:
-                    gal = gal.shear(fd_shear)
+                # if fd_shear is not None:
+                #     gal = gal.shear(fd_shear)
 
             starImg = gal.drawImage(wcs=real_wcs_local, offset=offset)
 
@@ -397,14 +404,6 @@ class Galaxy(MockObject):
         final = galsim.Convolve(psf, gal)
         return final
 
-    def rotateEllipticity(self, rotation):
-        if rotation == 1:
-            self.e1_disk, self.e2_disk, self.e1_bulge, self.e2_bulge, self.e1_total, self.e2_total = -self.e2_disk, self.e1_disk, -self.e2_bulge, self.e1_bulge, -self.e2_total, self.e1_total
-        if rotation == 2:
-            self.e1_disk, self.e2_disk, self.e1_bulge, self.e2_bulge, self.e1_total, self.e2_total = -self.e1_disk, -self.e2_disk, -self.e1_bulge, -self.e2_bulge, -self.e1_total, -self.e2_total
-        if rotation == 3:
-            self.e1_disk, self.e2_disk, self.e1_bulge, self.e2_bulge, self.e1_total, self.e2_total = self.e2_disk, -self.e1_disk, self.e2_bulge, -self.e1_bulge, self.e2_total, -self.e1_total
-
     def drawObject(self, img, final, noise_level=0.0, flux=None, filt=None, tel=None, exptime=150.):
         """ Override the method in parent class 
         Need to constrain the size of image stamp for extended objects

ObservationSim/MockObject/MockObject.py

@@ -32,6 +32,7 @@ class MockObject(object):
 
         # Place holder for outputs
         self.additional_output_str = ""
+        
         self.fd_shear = None
 
         self.logger = logger
@@ -61,7 +62,7 @@ class MockObject(object):
         dec = self.param["dec"]
         return galsim.CelestialCoord(ra=ra * galsim.degrees, dec=dec * galsim.degrees)
 
-    def getPosImg_Offset_WCS(self, img, fdmodel=None, chip=None, verbose=True, img_header=None):
+    def getPosImg_Offset_WCS(self, img, fdmodel=None, chip=None, verbose=True, chip_wcs=None, img_header=None):
         self.posImg = img.wcs.toImage(self.getPosWorld())
         self.localWCS = img.wcs.local(self.posImg)
         if (fdmodel is not None) and (chip is not None):
@@ -79,8 +80,10 @@ class MockObject(object):
         dx = x - self.x_nominal
         dy = y - self.y_nominal
         self.offset = galsim.PositionD(dx, dy)
-
-        if img_header is not None:
+        
+        if chip_wcs is not None:
+            self.real_wcs = chip_wcs
+        elif img_header is not None:
             self.real_wcs = galsim.FitsWCS(header=img_header)
         else:
             self.real_wcs = None
@@ -132,7 +135,8 @@ class MockObject(object):
             full = integrate_sed_bandpass(sed=self.sed, bandpass=filt.bandpass_full)
         except Exception as e:
             print(e)
-            self.logger.error(e)
+            if self.logger:
+                self.logger.error(e)
             return 2, None
 
         nphotons_sum = 0
@@ -164,7 +168,8 @@ class MockObject(object):
                 sub = integrate_sed_bandpass(sed=self.sed, bandpass=bandpass)
             except Exception as e:
                 print(e)
-                self.logger.error(e)
+                if self.logger:
+                    self.logger.error(e)
                 # return False
                 continue
 
@@ -214,7 +219,8 @@ class MockObject(object):
         else:
             # Return code 0: object photons missed this detector
             print("obj %s missed"%(self.id))
-            self.logger.info("obj %s missed"%(self.id))
+            if self.logger:
+                self.logger.info("obj %s missed"%(self.id))
             return 0, pos_shear
 
         del photons_list