Merge pull request #189 from desihub/add-desiname

DESINAME description
desihub · Feb 7, 2024 · 98a68fd · 98a68fd
2 parents 746385c + a62f017
commit 98a68fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/doc/changes.rst b/doc/changes.rst
@@ -5,13 +5,15 @@ desidatamodel Change Log
 23.6 (unreleased)
 -----------------
 
+* Add ``DESINAME`` description (PR `#189`_).
 * Update definition of ``ZCAT_NSPEC`` (PR `#187`_).
 * Add note about equivalent width values in ``fuji`` and ``guadalupe`` (PR `#181`_).
 * Add note about units in FITS files (PR `#178`_).
 
 .. _`#178`: https://github.com/desihub/desidatamodel/pull/178
 .. _`#181`: https://github.com/desihub/desidatamodel/pull/181
 .. _`#187`: https://github.com/desihub/desidatamodel/pull/187
+.. _`#189`: https://github.com/desihub/desidatamodel/pull/189
 
 23.1 (2023-06-12)
 -----------------

diff --git a/py/desidatamodel/data/column_descriptions.csv b/py/desidatamodel/data/column_descriptions.csv
@@ -41,6 +41,7 @@ DELTA_CHI2,float32,,Difference of chi2 between redrock fit and MgII fitter over
 DELTA_X,float64,mm,CS5 X requested minus actual position
 DELTA_Y,float64,mm,CS5 Y requested minus actual position
 DESI_TARGET,int64,,DESI (dark time program) target selection bitmask
+DESINAME,char[22],,Human readable identifier of a sky location precise to ~0.36 arcseconds. Note multiple objects can map to a single DESINAME if very close on the sky.
 DEVICE_LOC,int32,,Device location on focal plane [0-523]
 DEVICE_TYPE,char[3],,Device type
 EBV,float32,mag,Galactic extinction E(B-V) reddening from SFD98

diff --git a/py/desidatamodel/test/test_check.py b/py/desidatamodel/test/test_check.py
@@ -119,11 +119,14 @@ def test_files_to_regexp_with_missing_filetype(self, mock_type):
     @patch.object(DataModel, '_expectedtypes', ('foo', 'bar'))
     def test_files_to_regexp_with_bad_filetype(self):
         """Test compilation of regular expressions; log unusual file type.
+
+        Note that depending on the order in which the directory below is read,
+        the unexpected file type may be fits or json.
         """
         root = os.path.join(os.environ[DM], 'doc', 'DESI_SPECTRO_DATA')
         files = scan_model(root)
         foo = files[0].get_regexp(root)
-        self.assertLog(log, -1, "Unusual file type, json, detected for {0}!".format(files[0].filename))
+        self.assertLog(log, -1, "Unusual file type, %s, detected for %s!" % (files[0].filetype, files[0].filename))
 
     def test_get_regexp_filesize(self):
         """Test extraction of file size from data model documents.