Make star code work on phutils 1 and 2

notebooks/image_sim.py

@@ -168,25 +168,39 @@ def stars(image, number, max_counts=10000, gain=1, fwhm=4):
     # Most of the code below is a direct copy/paste from
     # https://photutils.readthedocs.io/en/stable/_modules/photutils/datasets/make.html#make_100gaussians_image
 
-    model = Gaussian2D()
-
     flux_range = [max_counts / 10, max_counts]
 
     y_max, x_max = image.shape
     xmean_range = [0.1 * x_max, 0.9 * x_max]
     ymean_range = [0.1 * y_max, 0.9 * y_max]
     xstddev_range = [fwhm, fwhm]
     ystddev_range = [fwhm, fwhm]
-    params = make_model_params(image.shape, number, x_name='x_mean',
-                               y_name='y_mean',
-                               amplitude=flux_range, x_stddev=xstddev_range,
-                               y_stddev=ystddev_range, theta=(0, 2*np.pi),
-                               x_mean=xmean_range,y_mean=ymean_range)
-
-
-    star_im = make_model_image(image.shape, model, params,
-                            x_name='x_mean', y_name='y_mean')
 
+    input_values = dict(
+        amplitude=flux_range,
+        x_mean=xmean_range,
+        y_mean=ymean_range,
+        x_stddev=xstddev_range,
+        y_stddev=ystddev_range,
+        theta=[0, 2 * np.pi]
+    )
+
+    if NEW_PHOTUTILS:
+        model = Gaussian2D()
+        params = make_model_params(image.shape, number, x_name='x_mean',
+                                y_name='y_mean',
+                                **input_values)
+
+
+        star_im = make_model_image(image.shape, model, params,
+                                x_name='x_mean', y_name='y_mean')
+    else:
+        sources = make_random_gaussians_table(
+            number,
+            input_values,
+            seed=12345
+        )
+        star_im = make_gaussian_sources_image(image.shape, sources)
     return star_im