diff --git a/ObservationSim/MockObject/Galaxy.py b/ObservationSim/MockObject/Galaxy.py index d538bc32eec81d1842f7d179393972ff2be76755..529484c4823b9d79b5d5dd0551acf4392585417c 100755 --- 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) - # 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) diff --git 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 deleted file mode 100755 index 3194dd91db573aa04048282cde2804c949255f34..0000000000000000000000000000000000000000 Binary files a/ObservationSim/MockObject/SpecDisperser/disperse_c/disperse.cpython-38-x86_64-linux-gnu.so and /dev/null differ diff --git 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 deleted file mode 100755 index 7f018d3e30e9da4b817ec63b6edd69a86835b35c..0000000000000000000000000000000000000000 Binary files a/ObservationSim/MockObject/SpecDisperser/disperse_c/interp.cpython-38-x86_64-linux-gnu.so and /dev/null differ