Merge branch 'master' into light_quickquasars

desihub · Feb 16, 2021 · 5289e14 · 5289e14
2 parents 5d52fed + 9a03f1a
commit 5289e14
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/doc/changes.rst b/doc/changes.rst
@@ -2,12 +2,22 @@
 desisim change log
 ==================
 
-0.35.5 (unreleased)
+0.35.6 (unreleased)
+-------------------
+
+* No changes yet
+
+0.35.5 (2021-02-15)
 -------------------
 
 * Migrated unit tests to GitHub Actions (`PR #546`_).
+* Fix negative arc line ringing (`PR #548`_).
+* Fix sim header keywords for TSNR calc (`PR #550`_, `PR #551`_).
 
 .. _`PR #546`: https://github.com/desihub/desisim/pull/546
+.. _`PR #548`: https://github.com/desihub/desisim/pull/548
+.. _`PR #550`: https://github.com/desihub/desisim/pull/550
+.. _`PR #551`: https://github.com/desihub/desisim/pull/551
 
 0.35.4 (2020-11-12)
 -------------------

diff --git a/py/desisim/_version.py b/py/desisim/_version.py
@@ -1 +1 @@
-__version__ = '0.35.4.dev2261'
+__version__ = '0.35.5.dev2290'
diff --git a/py/desisim/scripts/fastframe.py b/py/desisim/scripts/fastframe.py
@@ -132,6 +132,17 @@ def main(args=None):
                 xivar *= dwave**2
 
             meta['BUNIT']=units
+            meta['DETECTOR'] = 'SIM'
+            if camera[0] == 'b':
+                meta['CCDSIZE'] = '4162,4232'
+            else:
+                meta['CCDSIZE'] = '4194,4256'
+
+            readnoise = sim.instrument.cameras[i].read_noise.value
+            meta['OBSRDNA'] = readnoise
+            meta['OBSRDNB'] = readnoise
+            meta['OBSRDNC'] = readnoise
+            meta['OBSRDND'] = readnoise
 
             frame = Frame(wave, xphot, xivar, resolution_data=Rdata[0:imax-imin],
                           spectrograph=spectro, fibermap=xfibermap, meta=meta)