Merge branch 'random_knots_develop' of...

Merge branch 'random_knots_develop' of ssh://119.78.210.97:31415/data/simudata/CSSOSDataProductsSims/codes/CSST into random_knots_develop

ObservationSim/MockObject/Galaxy.py

@@ -131,12 +131,12 @@ class Galaxy(MockObject):
             bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)
             bulge = bulge.shear(bulge_shape)
 
-            gal = self.bfrac * bulge + (1.0 - self.bfrac) * disk
+            # gal = self.bfrac * bulge + (1.0 - self.bfrac) * disk
 
             # # (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
+            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)
@@ -220,12 +220,12 @@ class Galaxy(MockObject):
             bulge_shape = galsim.Shear(g1=self.e1_bulge, g2=self.e2_bulge)
             bulge = bulge.shear(bulge_shape)
 
-            gal = self.bfrac * bulge + (1.0 - self.bfrac) * disk
+            # gal = self.bfrac * bulge + (1.0 - self.bfrac) * disk
 
             # (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
+            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(tel.pupil_area * exptime)
             gal_shear = galsim.Shear(g1=g1, g2=g2)