Merge d3b0d15 into 97056a3

data/default_imsim_configs

@@ -8,6 +8,13 @@ scti = 1e-6
 [ccd]
 full_well = 1e5
 bf_strength = 1.0
+# Use a flat SED approximation and omit sensor effects for objects
+# with fluxes below max_flux_simple.
+max_flux_simple = 100
+# If the existing flux in the postage stamp for the object to be drawn
+# is above sensor_limit, then use of the SiliconSensor model is
+# forced, no matter what the object flux is.
+sensor_limit = 200
 
 [persistence]
 eimage_prefix = lsst_e_

python/desc/imsim/ImageSimulator.py

@@ -342,6 +342,8 @@ def __call__(self, gs_objects):
 
         # IMAGE_SIMULATOR must be a variable declared in the
         # outer scope and set to an ImageSimulator instance.
+        max_flux_simple = IMAGE_SIMULATOR.config['ccd']['max_flux_simple']
+        sensor_limit = IMAGE_SIMULATOR.config['ccd']['sensor_limit']
         gs_interpreter = IMAGE_SIMULATOR.gs_interpreters[self.sensor_name]
         with warnings.catch_warnings():
             warnings.filterwarnings('ignore', 'Automatic n_photons',
@@ -359,7 +361,9 @@ def __call__(self, gs_objects):
                 if not np.isnan(flux):
                     logger.debug("%s  %s  %s", gs_obj.uniqueId, flux,
                                  gs_obj.galSimType)
-                    gs_interpreter.drawObject(gs_obj)
+                    gs_interpreter.drawObject(gs_obj,
+                                              max_flux_simple=max_flux_simple,
+                                              sensor_limit=sensor_limit)
                     # Ensure the object's id is added to the drawn
                     # object set.
                     gs_interpreter.drawn_objects.add(gs_obj.uniqueId)