add random knots to gaalxy model

e9638802 · Fang Yuedong · 40121255 · e9638802 · 40121255 · 40121255
Commit e9638802 authored 2 years ago by Fang Yuedong
Hide whitespace changes
Inline Side-by-side

Showing

with 8 additions and 8 deletions
+8 -8
--- a/ObservationSim/MockObject/Galaxy.py
+++ b/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)
+            knots = galsim.RandomKnots(npoints=100, profile=disk)
-            # kfrac = np.random.random()*(1.0 - self.bfrac)
+            kfrac = np.random.random()*(1.0 - self.bfrac)
-            # gal = self.bfrac * bulge + (1.0 - self.bfrac - kfrac) * disk + kfrac * knots
+            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)
+            knots = galsim.RandomKnots(npoints=100, profile=disk)
-            # kfrac = np.random.random()*(1.0 - self.bfrac)
+            kfrac = np.random.random()*(1.0 - self.bfrac)
-            # gal = self.bfrac * bulge + (1.0 - self.bfrac - kfrac) * disk + kfrac * knots
+            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)

--- a/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.cpython-38-x86_64-linux-gnu.so
+++ b/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.cpython-38-x86_64-linux-gnu.so
--- a/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.cpython-38-x86_64-linux-gnu.so
+++ b/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.cpython-38-x86_64-linux-gnu.so