Merge pull request #2176 from desihub/fibermap-units

[WIP] Add units to fibermap tables
desihub · Feb 20, 2024 · 485f856 · 485f856
2 parents 0f17efc + a4e3314
commit 485f856
Show file tree

Hide file tree

Showing 17 changed files with 790 additions and 466 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -22,7 +22,7 @@ jobs:
                 fitsio-version: ['==1.1.6', '<2']  # fuji+guadalupe, latest
                 numpy-version: ['<1.23']  # to keep asscalar, used by astropy
         env:
-            DESIUTIL_VERSION: 3.2.6
+            DESIUTIL_VERSION: 3.4.2
             DESIMODEL_DATA: branches/test-0.18
 
         steps:
@@ -60,7 +60,7 @@ jobs:
                 fitsio-version: ['<2']  # latest
                 numpy-version: ['<1.23']  # to keep asscalar, used by astropy
         env:
-            DESIUTIL_VERSION: 3.2.6
+            DESIUTIL_VERSION: 3.4.2
             DESIMODEL_DATA: branches/test-0.18
 
         steps:

diff --git a/doc/changes.rst b/doc/changes.rst
@@ -7,8 +7,8 @@ desispec Change Log
 
 Major API/functional changes:
 
-* Dark missing from DESI_SPECTRO_DARK is now a fatal error unless
-  preproc with --fallback-on-dark-not-found (PR `#2162`_).
+* Dark missing from ``DESI_SPECTRO_DARK`` is now a fatal error unless
+  preproc with ``--fallback-on-dark-not-found`` (PR `#2162`_).
 * New CTE modeling on selected CCDs; requires matching DESI_SPECTRO_CALIB
   update post 0.5.1 (PR `#2163`_).
 
@@ -18,13 +18,15 @@ Smaller items and new features:
 * Add desi_link_calibnight script (PR `#2165`_).
 * Fix redrock API change templates_dir vs. template_path (PR `#2168`_).
 * Add read_spectra_parallel (PR `#2169`_).
+* Propagate units and comments in ``FIBERMAP`` HDUs (PR `#2176`_).
 
 .. _`#2160`: https://github.com/desihub/desispec/pull/2160
 .. _`#2162`: https://github.com/desihub/desispec/pull/2162
 .. _`#2163`: https://github.com/desihub/desispec/pull/2163
 .. _`#2165`: https://github.com/desihub/desispec/pull/2165
 .. _`#2168`: https://github.com/desihub/desispec/pull/2168
 .. _`#2169`: https://github.com/desihub/desispec/pull/2169
+.. _`#2176`: https://github.com/desihub/desispec/pull/2176
 
 0.61.0 (2024-01-15)
 -------------------

diff --git a/doc/nb/FibermapCombinationTest.ipynb b/doc/nb/FibermapCombinationTest.ipynb
@@ -16,7 +16,7 @@
     "## Replicate `assemble_fibermap` script\n",
     "\n",
     "```\n",
-    "assemble_fibermap -n NIGHT -e EXPID -o OUTFILE\n",
+    "desi_assemble_fibermap -n NIGHT -e EXPID -o OUTFILE\n",
     "```"
    ]
   },
@@ -86,7 +86,7 @@
     "expid = '00101293'\n",
     "outfile = os.path.join(os.environ['CSCRATCH'], f'fibermap-{expid}.fits')\n",
     "\n",
-    "with patch('sys.argv', ['assemble_fibermap', '-n', night, '-e', expid, '-o', outfile]) as foo: \n",
+    "with patch('sys.argv', ['desi_assemble_fibermap', '-n', night, '-e', expid, '-o', outfile]) as foo:\n",
     "    parser = argparse.ArgumentParser(usage = \"{prog} [options]\")\n",
     "    parser.add_argument(\"-n\", \"--night\", type=int, required=True,\n",
     "            help=\"input night\")\n",
@@ -1570,7 +1570,7 @@
     "else:\n",
     "    log.warning(\"Setting RELEASE to int16.\")\n",
     "    fibermap['RELEASE'] = fibermap['RELEASE'].astype(np.int16)\n",
-    "    \n",
+    "\n",
     "#- Some code incorrectly relies upon the fibermap being sorted by\n",
     "#- fiber number, so accomodate that before returning the table\n",
     "fibermap.sort('FIBER')\n"
@@ -2552,7 +2552,7 @@
     }
    ],
    "source": [
-    "sv2dark = (program == 'dark') & (exposures['SURVEY'] == 'sv2') & (exposures['NIGHT'] == 20210403) \n",
+    "sv2dark = (program == 'dark') & (exposures['SURVEY'] == 'sv2') & (exposures['NIGHT'] == 20210403)\n",
     "exposures['NIGHT'][sv2dark], exposures['EXPID'][sv2dark]"
    ]
   },
@@ -2579,7 +2579,7 @@
     }
    ],
    "source": [
-    "sv2bright = (program == 'bright') & (exposures['SURVEY'] == 'sv2') & (exposures['NIGHT'] == 20210324) \n",
+    "sv2bright = (program == 'bright') & (exposures['SURVEY'] == 'sv2') & (exposures['NIGHT'] == 20210324)\n",
     "exposures['NIGHT'][sv2bright], exposures['EXPID'][sv2bright]"
    ]
   },
@@ -2604,7 +2604,7 @@
     }
    ],
    "source": [
-    "sv3dark = (program == 'dark') & (exposures['SURVEY'] == 'sv3') & (exposures['NIGHT'] == 20210420) \n",
+    "sv3dark = (program == 'dark') & (exposures['SURVEY'] == 'sv3') & (exposures['NIGHT'] == 20210420)\n",
     "exposures['NIGHT'][sv3dark], exposures['EXPID'][sv3dark]"
    ]
   },
@@ -2631,7 +2631,7 @@
     }
    ],
    "source": [
-    "sv3bright = (program == 'bright') & (exposures['SURVEY'] == 'sv3') & (exposures['NIGHT'] == 20210420) \n",
+    "sv3bright = (program == 'bright') & (exposures['SURVEY'] == 'sv3') & (exposures['NIGHT'] == 20210420)\n",
     "exposures['NIGHT'][sv3bright], exposures['EXPID'][sv3bright]"
    ]
   },
@@ -2659,7 +2659,7 @@
     }
    ],
    "source": [
-    "maindark = (program == 'dark') & (exposures['SURVEY'] == 'main')  & (exposures['NIGHT'] == 20210531) \n",
+    "maindark = (program == 'dark') & (exposures['SURVEY'] == 'main')  & (exposures['NIGHT'] == 20210531)\n",
     "exposures['NIGHT'][maindark], exposures['EXPID'][maindark]"
    ]
   },
@@ -2683,7 +2683,7 @@
     }
    ],
    "source": [
-    "mainbright = (program == 'bright') & (exposures['SURVEY'] == 'main')  & (exposures['NIGHT'] == 20210531) \n",
+    "mainbright = (program == 'bright') & (exposures['SURVEY'] == 'main')  & (exposures['NIGHT'] == 20210531)\n",
     "exposures['NIGHT'][mainbright], exposures['EXPID'][mainbright]"
    ]
   },