Commit f5372672 authored by Zhang Xin's avatar Zhang Xin
Browse files

header commit sigture; galaxy hlr =0 bug

parent 37c6808a

Catalog/Calib_Catalog.py

+8 −3
Original line number Diff line number Diff line
@@ -619,9 +619,14 @@ class Catalog(CatalogBase): 
            data = Table.read(os.path.join(self.CALIB_SED_path,obj.id+'.fits'))

            obj_w = data['WAVELENGTH']

            obj_f = data['FLUX']

            lamb = np.arange(2000, 11001 + 0.5, 0.5)

            input_delt_w = np.min(obj_w[1:]-obj_w[0:-1])

            if input_delt_w > 0.5:

                lamb = np.arange(2000, 11000 + 0.5, 0.5)

                speci = interpolate.interp1d(obj_w, obj_f)

                y1 = speci(lamb)

            else:

                lamb = obj_w

                y1 = obj_f

            # erg/s/cm2/A --> photon/s/m2/A

            y1_phot = y1 * lamb / (cons.h.value * cons.c.value) * 1e-13

            sed = Table(np.array([lamb, y1_phot]).T,

ObservationSim/Config/Header/extension_header.header

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

ObservationSim/Config/Header/global_header.header

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

ObservationSim/MockObject/Galaxy.py

+7 −2
Original line number Diff line number Diff line
@@ -276,6 +276,11 @@ class Galaxy(MockObject): 
            bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)

            bulge = bulge.shear(bulge_shape)

            

            if self.bfrac == 0:

                gal = disk

            elif self.bfrac == 1:

                gal = bulge

            else:

                gal = self.bfrac * bulge + (1.0 - self.bfrac) * disk



            # (TEST) Random knots