Commit 39056735 authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge branch 'master' into 'current_stable_for_tests' 

checksum fixing in header

See merge request !20
parents c48d8742 59153d14

.gitignore

+3 −1
Original line number Diff line number Diff line
@@ -8,3 +8,5 @@ dist/* 
!*libshao.so

*.out

pnodes

.coverage

coverage
 
 No newline at end of file

ObservationSim/Instrument/Chip/Chip.py

+771 −771

File changed.

Preview size limit exceeded, changes collapsed.

ObservationSim/Instrument/FocalPlane.py

+36 −33
Original line number Diff line number Diff line 
import galsim

import numpy as np





class FocalPlane(object):

    def __init__(self, config=None, chip_list=None, survey_type='Photometric', bad_chips=None):

    def __init__(self, chip_list=None, survey_type='Photometric', bad_chips=None):

        """Get the focal plane layout

        """

        self.nchips = 42
@@ -39,18 +40,18 @@ class FocalPlane(object): 
            for i in range(1, 31):

                self.ignore_chips.append(i)



        if config is not None:

            self.nchip_x    = config["nchip_x"]

            self.nchip_y    = config["nchip_y"]

            self.npix_tot_x = config["npix_tot_x"]

            self.npix_tot_y = config["npix_tot_y"]

            self.npix_gap_x = config["npix_gap_x"]

            self.npix_gap_y = config["npix_gap_y"]

            if "chipLabelIDs" in config:

                self.chipLabelIDs = config["chipLabelIDs"]

            if "bad_chips" in config:

                self.bad_chips = config["bad_chips"]

        else:

        # if config is not None:

        #     self.nchip_x    = config["nchip_x"]

        #     self.nchip_y    = config["nchip_y"]

        #     self.npix_tot_x = config["npix_tot_x"]

        #     self.npix_tot_y = config["npix_tot_y"]

        #     self.npix_gap_x = config["npix_gap_x"]

        #     self.npix_gap_y = config["npix_gap_y"]

        #     if "chipLabelIDs" in config:

        #         self.chipLabelIDs = config["chipLabelIDs"]

        #     if "bad_chips" in config:

        #         self.bad_chips = config["bad_chips"]

        # else:

        self.nchip_x = 6

        self.nchip_y = 5

        self.npix_tot_x = 59516
@@ -89,7 +90,8 @@ class FocalPlane(object): 
            WCS of the focal plane

        """

        if logger is not None:

            logger.info("    Construct the wcs of the entire image mosaic using Gnomonic/TAN projection")

            logger.info(

                "    Construct the wcs of the entire image mosaic using Gnomonic/TAN projection")

        if (xcen == None) or (ycen == None):

            xcen = self.cen_pix_x

            ycen = self.cen_pix_y
@@ -104,7 +106,8 @@ class FocalPlane(object): 
        dvdy = -np.cos(img_rot.rad) * pix_scale



        moscen = galsim.PositionD(x=xcen, y=ycen)

        sky_center = galsim.CelestialCoord(ra=ra*galsim.degrees, dec=dec*galsim.degrees)

        sky_center = galsim.CelestialCoord(

            ra=ra*galsim.degrees, dec=dec*galsim.degrees)

        affine = galsim.AffineTransform(dudx, dudy, dvdx, dvdy, origin=moscen)

        WCS = galsim.TanWCS(affine, sky_center, units=galsim.arcsec)

ObservationSim/Straylight/lib/PST

100755 → 100644
+73 −73

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

ObservationSim/sim_steps/add_objects.py

+6 −0
Original line number Diff line number Diff line
@@ -206,6 +206,12 @@ def add_objects(self, chip, filt, tel, pointing, catalog, obs_param): 
        except Exception as e:

            traceback.print_exc()

            self.chip_output.Log_error(e)

            self.chip_output.Log_error(

                "pointing: #%d, chipID: %d" % (pointing.id, chip.chipID))

            if obj.type == "galaxy":

                self.chip_output.Log_error("obj id: %s" % (obj.param['id']))

                self.chip_output.Log_error("    e1: %.5f\n    e2: %.5f\n    size: %f\n    bfrac: %f\n    detA: %f\n    g1: %.5f\n    g2: %.5f\n" % (

                    obj.param['e1'], obj.param['e2'], obj.param['size'], obj.param['bfrac'], obj.param['detA'], obj.param['g1'], obj.param['g2']))



        # Unload SED:

        obj.unload_SED()