Commit 8bd01973 authored by Fang Yuedong's avatar Fang Yuedong
Browse files

Merge remote-tracking branch 'origin/new_sim' into new_sim

parents e77d4046 f5372672

Catalog/Calib_Catalog.py

0 → 100644
+673 −0

File added.

Preview size limit exceeded, changes collapsed.

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

ObservationSim/MockObject/MockObject.py

+5 −0
Original line number Diff line number Diff line
@@ -26,6 +26,11 @@ class MockObject(object): 
        elif self.param["star"] == 3:

            self.type = "stamp"

        ###mock_stamp_END

        ###for calibration

        elif self.param["star"] == 4:

            self.type = "calib"

        ###END



        self.sed = None

        self.fd_shear = None

        # Place holder for outputs