Updates for 18.3

.travis.yml

@@ -27,7 +27,6 @@ addons:
             - texlive-latex-extra
             - dvipng
 python:
-    - 2.7
     - 3.5
     - 3.6
 env:
@@ -36,7 +35,7 @@ env:
         # overidden underneath. They are defined here in order to save having
         # to repeat them for all configurations.
         - MAIN_CMD='python setup.py'
-        - DESIUTIL_VERSION=1.9.9
+        - DESIUTIL_VERSION=1.9.10
     matrix:
         - SETUP_CMD='egg_info'
         - SETUP_CMD='bdist_egg'
@@ -50,18 +49,18 @@ matrix:
     allow_failures:
         - os: osx
         - os: linux
-          python: 3.5
+          python: 3.6
           env: MAIN_CMD='pycodestyle' SETUP_CMD='--count py/desidatamodel'
 
     include:
         # Check for sphinx doc build warnings.
         - os: linux
-          python: 3.5
+          python: 3.6
           env: SETUP_CMD='build_sphinx --warning-is-error'
 
         # Coverage test, pass the results to coveralls.
         - os: linux
-          python: 3.5
+          python: 3.6
           env: MAIN_CMD='coverage' SETUP_CMD='run --source=desidatamodel setup.py test'
 
         # Experimental OS X test.
@@ -73,7 +72,7 @@ matrix:
 
         # PEP 8 compliance.
         - os: linux
-          python: 3.5
+          python: 3.6
           env: MAIN_CMD='pycodestyle' SETUP_CMD='--count py/desidatamodel'
 
 # before_install:

doc/DESI_SPECTRO_REDUX/SPECPROD/calibnight/NIGHT/fiberflatnight-CAMERA-NIGHT.rst

@@ -0,0 +1,152 @@
+===========================
+fiberflatnight-CAMERA-NIGHT
+===========================
+
+:Summary: *This section should be filled in with a high-level description of
+    this file. In general, you should remove or replace the emphasized text
+    (\*this text is emphasized\*) in this document.*
+:Naming Convention: ``fiberflatnight-CAMERA-NIGHT.fits``, where ``CAMERA`` is
+    *e.g.*, "b0", "r5", etc. and ``NIGHT`` is the observation night in
+    YYYYMMDD format.
+:Regex: ``fiberflatnight-[brz][0-9]-[0-9]{8}.fits``
+:File Type: FITS, 10 MB
+
+Contents
+========
+
+====== ========== ======== ===================
+Number EXTNAME    Type     Contents
+====== ========== ======== ===================
+HDU0_  FIBERFLAT  IMAGE    *Brief Description*
+HDU1_  IVAR       IMAGE    *Brief Description*
+HDU2_  MASK       BINTABLE *Brief Description*
+HDU3_  MEANSPEC   IMAGE    *Brief Description*
+HDU4_  WAVELENGTH IMAGE    *Brief Description*
+====== ========== ======== ===================
+
+
+FITS Header Units
+=================
+
+HDU0
+----
+
+EXTNAME = FIBERFLAT
+
+*Summarize the contents of this HDU.*
+
+Required Header Keywords
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+======== ======================= ===== ==============================================
+KEY      Example Value           Type  Comment
+======== ======================= ===== ==============================================
+NAXIS1   2645                    int
+NAXIS2   500                     int
+EXPID    25                      int
+NIGHT    20200318                str
+FLAVOR   flat                    str
+DOSVER   SIM                     str
+DATE-OBS 2020-03-18T22:00:00.000 str
+EXPTIME  10.0                    float
+FEEVER   SIM                     str
+AIRORVAC vac                     str   Vacuum wavelengths
+CAMERA   r6                      str
+FIBERMIN 3000                    int
+CHECKSUM 3GDaAE9W6ECaAE9U        str   HDU checksum updated 2018-03-29T21:38:41
+DATASUM  2868401259              str   data unit checksum updated 2018-03-29T21:38:41
+CHI2PDF  1.052080036564363       float
+======== ======================= ===== ==============================================
+
+Data: FITS image [float32, 2645x500]
+
+HDU1
+----
+
+EXTNAME = IVAR
+
+*Summarize the contents of this HDU.*
+
+Required Header Keywords
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+======== ================ ==== ==============================================
+KEY      Example Value    Type Comment
+======== ================ ==== ==============================================
+NAXIS1   2645             int
+NAXIS2   500              int
+CHECKSUM QedlRcbkQcbkQcbk str  HDU checksum updated 2018-03-29T21:38:41
+DATASUM  2161531188       str  data unit checksum updated 2018-03-29T21:38:41
+======== ================ ==== ==============================================
+
+Data: FITS image [float32, 2645x500]
+
+HDU2
+----
+
+EXTNAME = MASK
+
+*Summarize the contents of this HDU.*
+
+Required Header Keywords
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+======== ================ ==== ==============================================
+KEY      Example Value    Type Comment
+======== ================ ==== ==============================================
+NAXIS1   8                int  width of table in bytes
+NAXIS2   500              int  number of rows in table
+BSCALE   1                int
+BZERO    2147483648       int
+CHECKSUM LmE7NjE7LjE7LjE7 str  HDU checksum updated 2018-03-29T21:38:41
+DATASUM  7014250          str  data unit checksum updated 2018-03-29T21:38:41
+======== ================ ==== ==============================================
+
+Data: FITS image [int32 (compressed), 8x500]
+
+HDU3
+----
+
+EXTNAME = MEANSPEC
+
+*Summarize the contents of this HDU.*
+
+Required Header Keywords
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+======== ================ ==== ==============================================
+KEY      Example Value    Type Comment
+======== ================ ==== ==============================================
+NAXIS1   2645             int
+CHECKSUM 9bCFEZAF9bAFEZAF str  HDU checksum updated 2018-03-29T21:38:41
+DATASUM  360710800        str  data unit checksum updated 2018-03-29T21:38:41
+======== ================ ==== ==============================================
+
+Data: FITS image [float32, 2645]
+
+HDU4
+----
+
+EXTNAME = WAVELENGTH
+
+*Summarize the contents of this HDU.*
+
+Required Header Keywords
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+======== ================ ==== ==============================================
+KEY      Example Value    Type Comment
+======== ================ ==== ==============================================
+NAXIS1   2645             int
+BUNIT    Angstrom         str
+CHECKSUM 7A46A9240A247724 str  HDU checksum updated 2018-03-29T21:38:41
+DATASUM  1455388369       str  data unit checksum updated 2018-03-29T21:38:41
+======== ================ ==== ==============================================
+
+Data: FITS image [float32, 2645]
+
+
+Notes and Examples
+==================
+
+*Add notes and examples here.  You can also create links to example files.*

doc/DESI_SPECTRO_REDUX/SPECPROD/calib2d/NIGHT/index.rst → doc/DESI_SPECTRO_REDUX/SPECPROD/calibnight/NIGHT/index.rst

@@ -5,4 +5,4 @@ NIGHT
 .. toctree::
    :maxdepth: 1
 
-   fiberflat-CAMERA-EXPID
+   fiberflatnight-CAMERA-NIGHT

doc/DESI_SPECTRO_REDUX/SPECPROD/calib2d/index.rst → doc/DESI_SPECTRO_REDUX/SPECPROD/calibnight/index.rst

@@ -1,6 +1,6 @@
-=======
-calib2d
-=======
+==========
+calibnight
+==========
 
 .. toctree::
    :maxdepth: 1

doc/DESI_SPECTRO_REDUX/SPECPROD/calib2d/psf/NIGHT/index.rst → doc/DESI_SPECTRO_REDUX/SPECPROD/calibnight/psf/NIGHT/index.rst

@@ -6,4 +6,3 @@ NIGHT
    :maxdepth: 1
 
    psf-CAMERA
-   psfboot-CAMERA

doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/index.rst

@@ -7,7 +7,9 @@ EXPID
 
     calib-CAMERA-EXPID.rst
     cframe-CAMERA-EXPID.rst
+    fiberflat-CAMERA-EXPID.rst
     frame-CAMERA-EXPID.rst
     psf-CAMERA-EXPID.rst
+    psfboot-CAMERA-EXPID.rst
     sky-CAMERA-EXPID.rst
     stdstars-SPECTROGRAPH-EXPID.rst

doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/psf-CAMERA-EXPID.rst

@@ -6,7 +6,7 @@ Spectrograph point spread functions (PSFs) derived from individual arc
 exposures will be in
 ``$DESI_SPECTRO_REDUX/{prodname}/exposures/{night}/{expid}/psf*.fits`` .
 These may be combined into a nightly PSF in
-``$DESI_SPECTRO_REDUX/{prodname}/calib2d/psf/{night}/{expid}/psf*.fits`` .
+``$DESI_SPECTRO_REDUX/{prodname}/calibnight/psf/{night}/{expid}/psf*.fits`` .
 
 See that location for details on the format.
 

doc/DESI_SPECTRO_REDUX/SPECPROD/calib2d/psf/NIGHT/psfboot-CAMERA.rst → doc/DESI_SPECTRO_REDUX/SPECPROD/exposures/NIGHT/EXPID/psfboot-CAMERA-EXPID.rst

@@ -1,11 +1,11 @@
-==============
-psfboot-CAMERA
-==============
+====================
+psfboot-CAMERA-EXPID
+====================
 
 :Summary: psfboot file.
-:Naming Convention: ``psfboot-CAMERA.fits``, where ``CAMERA`` is *e.g.*,
-    "b0", "r1", "z2".
-:Regex: ``psfboot-[brz][0-9]\.fits``
+:Naming Convention: ``psfboot-CAMERA-EXPID.fits``, where ``CAMERA`` is *e.g.*,
+    "b0", "r1", "z2", and ``EXPID`` is an 8 digit exposure number.
+:Regex: ``psfboot-[brz][0-9]-[0-9]{8}\.fits``
 :File Type: FITS, 64 KB
 
 This file is a first fit to the x vs. y vs. wavelength solutions and

doc/DESI_SPECTRO_REDUX/SPECPROD/index.rst

@@ -18,28 +18,31 @@ Input files for spectroscopic reduction::
 Output files::
 
     $DESI_SPECTRO_REDUX/$SPECPROD/
-        config-{expid}.json
         pix-{camera}-{expid}.fits               -- optional
+        calibnight/{night}/
+            fiberflatnight-{camera}-{night}.fits
+        calibnight/psf/{night}/
+            psf-{camera}.fits
         exposures/{night}/{expid}/
-            frame-{camera}-{expid}.fits
-            skymodel-{camera}-{expid}.fits
-            fluxcalib-{camera}-{expid}.fits
+            calib-{camera}-{expid}.fits
             cframe-{camera}-{expid}.fits
+            frame-{camera}-{expid}.fits
+            psf-{camera}-{expid}.fits
+            psfboot-{camera}-{expid}.fits
+            sky-{camera}-{expid}.fits
+            stdstars-{spectrograph}-{expid}.fits
         spectra-{nside}/{group}/{pixnum}/
+            coadd-{nside}-{pixnum}.fits     -- does not yet exist
             spectra-{nside}-{pixnum}.fits
             zbest-{nside}-{pixnum}.fits
-            coadd-{nside}-{pixnum}.fits     -- does not yet exist
-        calib1d/{night}/
-            fiberflat-{camera}-{expid}.fits
-        calib2d/{night}/
-            psf/psf-{camera}-{expid}.fits
+        zcatalog-{specprod}.fits
 
 
 .. toctree::
    :maxdepth: 1
 
    calib1d/index
-   calib2d/index
+   calibnight/index
    exposures/index
    spectra-NSIDE/index
    zcatalog-SPECPROD