Skip to content

Commit

Permalink
Merge add4825 into 8f6003b
Browse files Browse the repository at this point in the history
  • Loading branch information
rmjarvis committed Nov 26, 2018
2 parents 8f6003b + add4825 commit 13bac1d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
4 changes: 4 additions & 0 deletions data/default_imsim_configs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ max_flux_simple = 100
# forced, no matter what the object flux is.
sensor_limit = 200

# If the peak pixel value is > fft_sb_thresh, then transition to fft rendering.
# This value should be at least as large as full_well. 2xfull_well is conservative.
fft_sb_thresh = 2e5

[persistence]
eimage_prefix = lsst_e_
eimage_compress = True
Expand Down
4 changes: 3 additions & 1 deletion python/desc/imsim/ImageSimulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ def __call__(self, gs_objects):
# 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']
fft_sb_thresh = IMAGE_SIMULATOR.config['ccd'].get('fft_sb_thresh',None)
gs_interpreter = IMAGE_SIMULATOR.gs_interpreters[self.sensor_name]
with warnings.catch_warnings():
warnings.filterwarnings('ignore', 'Automatic n_photons',
Expand All @@ -387,7 +388,8 @@ def __call__(self, gs_objects):
gs_obj.galSimType)
gs_interpreter.drawObject(gs_obj,
max_flux_simple=max_flux_simple,
sensor_limit=sensor_limit)
sensor_limit=sensor_limit,
fft_sb_thresh=fft_sb_thresh)
# Ensure the object's id is added to the drawn
# object set.
gs_interpreter.drawn_objects.add(gs_obj.uniqueId)
Expand Down

0 comments on commit 13bac1d

Please sign in to comment.