improve gmu.return_requested_units() to allow any input units

gemini_instruments/bhros/adclass.py

@@ -17,22 +17,22 @@ def _tag_instrument(self):
         return TagSet({'BHROS', 'SPECT'}, ())
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units(input_units="AA")
     def central_wavelength(self):
         """
-        Returns the central wavelength in nm
+        Returns the central wavelength
 
         Returns
         -------
         float
-            The central wavelength setting in nm
+            The central wavelength setting
         """
         # The central_wavelength keyword is in Angstroms
         keyword = self._keyword_for('central_wavelength')
         wave_in_angstroms = self.phu.get(keyword, -1)
         if wave_in_angstroms < 0:
             return None
-        return wave_in_angstroms * 0.1
+        return wave_in_angstroms
 
     @astro_data_descriptor
     def dec(self):

gemini_instruments/f2/adclass.py

@@ -164,7 +164,7 @@ def camera(self, stripID=False, pretty=False):
         return self._may_remove_component(camera, stripID, pretty)
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units()
     def central_wavelength(self):
         """
         Returns the central wavelength in nm
@@ -302,7 +302,7 @@ def detector_y_offset(self):
         return -offset if self.phu.get('INPORT') == 1 else offset
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units()
     def dispersion(self):
         """
         Returns the dispersion in nm per pixel as a list (one value per

gemini_instruments/f2/tests/test_f2.py

@@ -6,6 +6,11 @@
 import gemini_instruments
 from gemini_instruments.f2 import AstroDataF2
 
+import numpy as np
+
+
+FLOAT_TYPES = (float, np.float32, np.float64)
+
 test_files = [
     "S20131121S0094.fits",
     "S20131126S1111.fits",
@@ -16,9 +21,9 @@
 ]
 
 F2_DESCRIPTORS_TYPES = [
-    ('detector_x_offset', float),
-    ('detector_y_offset', float),
-    ('pixel_scale', float),
+    ('detector_x_offset', FLOAT_TYPES),
+    ('detector_y_offset', FLOAT_TYPES),
+    ('pixel_scale', FLOAT_TYPES),
 ]
 
 

gemini_instruments/flamingos/adclass.py

@@ -41,15 +41,15 @@ def _tag_dark(self):
             return TagSet(['DARK', 'CAL'])
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units()
     def central_wavelength(self):
         """
-        Returns the central wavelength in nm
+        Returns the central wavelength
 
         Returns
         -------
         float
-            The central wavelength setting in nm
+            The central wavelength setting
         """
         return 1500.0
 

gemini_instruments/gemini/adclass.py

@@ -610,23 +610,23 @@ def cass_rotator_pa(self):
         return crpa if abs(crpa) <= 360 else None
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units(input_units="um")
     def central_wavelength(self):
         """
-        Returns the central wavelength in nm or the specified units
+        Returns the central wavelength
 
         Returns
         -------
         float
-            The central wavelength setting in nm
+            The central wavelength setting
         """
         # We assume that the central_wavelength keyword is in microns
         keyword = self._keyword_for('central_wavelength')
         wave_in_microns = float(self.phu.get(keyword, -1))
 
         if wave_in_microns < 0:
             return None
-        return 1000 * wave_in_microns
+        return wave_in_microns
 
     @astro_data_descriptor
     def coadds(self):
@@ -870,7 +870,7 @@ def disperser(self, stripID=False, pretty=False):
                                           stripID, pretty)
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units(input_units="m")
     def dispersion(self):
         """
         Returns the dispersion in nm per pixel as a list (one value per
@@ -883,6 +883,7 @@ def dispersion(self):
             The dispersion(s) in nm
         """
         keyword = self._keyword_for('dispersion')
+        print(keyword)
         if keyword in self.hdr:
             dispersion = self.hdr[keyword]
         elif self._keyword_for('dispersion') in self.phu:
@@ -892,7 +893,7 @@ def dispersion(self):
         else:
             return None
 
-        return 1e-9 * dispersion
+        return dispersion
 
     @astro_data_descriptor
     def dispersion_axis(self):

gemini_instruments/ghost/adclass.py

@@ -395,7 +395,7 @@ def calibration_key(self):
 
     # FIXME Remove once headers corrected
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units()
     def central_wavelength(self): # pragma: no cover
         """
         Dummy to work around current Gemini cal_mgr

gemini_instruments/gmos/adclass.py

@@ -207,7 +207,7 @@ def array_name(self):
         return self.hdr.get('AMPNAME')
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units()
     def central_wavelength(self, pretty=False):
         """
         Returns the central wavelength in nm
@@ -430,7 +430,7 @@ def disperser(self, stripID=False, pretty=False):
         return disperser
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units()
     def dispersion(self):
         """
         Returns the dispersion in nm per binned pixel as a list (one value per
@@ -474,7 +474,7 @@ def dispersion(self):
 
         if dispersion is not None:
             grating_order = self.phu.get('GRORDER', 1)
-            dispersion = 1e-9 * dispersion / grating_order
+            dispersion = 1e9 * dispersion / grating_order
 
             if not self.is_single:
                 dispersion = [dispersion] * len(self)

gemini_instruments/gmos/tests/test_gmos.py

@@ -4,9 +4,14 @@
 import astrodata.testing
 import gemini_instruments
 
+import numpy as np
+
+
+FLOAT_TYPES = (float, np.float32, np.float64)
+
 GMOS_DESCRIPTORS_TYPES = [
-    ('detector_x_offset', float),
-    ('detector_y_offset', float),
+    ('detector_x_offset', FLOAT_TYPES),
+    ('detector_y_offset', FLOAT_TYPES),
     ('nod_count', tuple),
     ('nod_offsets', tuple),
     ('pixel_scale', float),

gemini_instruments/gmu.py

@@ -4,6 +4,8 @@
 import re
 from functools import wraps
 
+import numpy as np
+
 from astropy import coordinates, units as u
 
 # The unitDict dictionary defines the factors for the function
@@ -106,38 +108,41 @@ def convert_units(input_units, input_value, output_units):
         return input_value * factor
 
 
-def return_requested_units(fn):
+def return_requested_units(input_units='nm'):
     """
     Decorator that replaces the repeated code for asMicrometers,
     asNanometers, asAngstroms. Should be replaced by a "units='nm'"
-    parameter, but time is limited. Keeping current coding to avoid
+    parameter, but time is limited.
+
+    Returns as np.float32 values to avoid excessive precision
     """
-    @wraps(fn)
-    def gn(instance, asMicrometers=False, asNanometers=False, asAngstroms=False,
-           **kwargs):
-        unit_arg_list = [asMicrometers, asNanometers, asAngstroms]
-        output_units = u.m # By default
-        if unit_arg_list.count(True) == 1:
-            # Just one of the unit arguments was set to True. Return the
-            # central wavelength in these units
-            if asMicrometers:
-                output_units = u.um
-            elif asNanometers:
-                output_units = u.nm
-            else:
-                output_units = u.AA
-
-        # Ensure we return a list, not an array
-        # nm are the "standard" DRAGONS wavelength unit
-        retval = fn(instance, **kwargs)
-        if retval is None:
-            return retval
-        if isinstance(retval, list):
-            return [None if v is None else (v * u.nm).to(output_units).value
-                    for v in retval]
-        return (fn(instance) * u.nm).to(output_units).value
-
-    return gn
+    def inner_decorator(fn):
+        @wraps(fn)
+        def gn(instance, asMicrometers=False, asNanometers=False, asAngstroms=False,
+               **kwargs):
+            unit_arg_list = [asMicrometers, asNanometers, asAngstroms]
+            output_units = u.m # By default
+            if unit_arg_list.count(True) == 1:
+                # Just one of the unit arguments was set to True. Return the
+                # central wavelength in these units
+                if asMicrometers:
+                    output_units = u.um
+                elif asNanometers:
+                    output_units = u.nm
+                else:
+                    output_units = u.AA
+
+            # Ensure we return a list, not an array
+            # nm are the "standard" DRAGONS wavelength unit
+            retval = fn(instance, **kwargs)
+            if retval is None:
+                return retval
+            if isinstance(retval, list):
+                return [None if v is None else np.float32((v * u.Unit(input_units)).to(output_units).value)
+                        for v in retval]
+            return np.float32((retval * u.Unit(input_units)).to(output_units).value)
+        return gn
+    return inner_decorator
 
 
 def toicrs(frame, ra, dec, equinox=2000.0, ut_datetime=None):

gemini_instruments/gnirs/adclass.py

@@ -91,8 +91,8 @@ def array_name(self):
             return self.phu.get(self._keyword_for('array_name'))
 
     @astro_data_descriptor
-    @gmu.return_requested_units
-    def dispersion(self,):
+    @gmu.return_requested_units()
+    def dispersion(self):
         """
         Returns the dispersion in nm per pixel as a list (one value per
         extension) or a float if used on a single-extension slice. It is

gemini_instruments/gnirs/tests/test_gnirs.py

@@ -5,6 +5,11 @@
 import gemini_instruments
 from gemini_instruments.gnirs import AstroDataGnirs
 
+import numpy as np
+
+
+FLOAT_TYPES = (float, np.float32, np.float64)
+
 test_files = [
     "N20190206S0279.fits",
     "N20190214S0058.fits",
@@ -15,9 +20,9 @@
 
 
 GNIRS_DESCRIPTORS_TYPES = [
-    ('detector_x_offset', float),
-    ('detector_y_offset', float),
-    ('pixel_scale', float),
+    ('detector_x_offset', FLOAT_TYPES),
+    ('detector_y_offset', FLOAT_TYPES),
+    ('pixel_scale', FLOAT_TYPES),
 ]
 
 

gemini_instruments/graces/adclass.py

@@ -35,10 +35,10 @@ def _tag_bias(self):
             return TagSet(['BIAS', 'CAL'])
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units()
     def central_wavelength(self):
         """
-        Returns the central wavelength in nm
+        Returns the central wavelength
 
         Returns
         -------

gemini_instruments/gsaoi/adclass.py

@@ -67,21 +67,21 @@ def array_name(self):
             return self.phu.get('DETECTOR')
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units(input_units="AA")
     def central_wavelength(self):
         """
-        Returns the central wavelength in nm
+        Returns the central wavelength
 
         Returns
         -------
         float
-            The central wavelength setting in nm
+            The central wavelength setting
         """
         central_wavelength = self.phu.get('WAVELENG', -1)  # in Angstroms
         if central_wavelength < 0.0:
             return None
 
-        return 0.1 * central_wavelength
+        return central_wavelength
 
     @returns_list
     @use_keyword_if_prepared

gemini_instruments/niri/adclass.py

@@ -78,7 +78,7 @@ def array_section(self, pretty=False):
         return build_ir_section(self, pretty)
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units()
     def central_wavelength(self):
         """
         Returns the central wavelength in nm
@@ -251,7 +251,7 @@ def disperser(self, stripID=False, pretty=False):
             return 'MIRROR'
 
     @astro_data_descriptor
-    @gmu.return_requested_units
+    @gmu.return_requested_units()
     def dispersion(self):
         """
         Returns the dispersion in nm per pixel as a list (one value per

gemini_instruments/test/test_astrodata_descriptors.py

@@ -4,6 +4,11 @@
 import gemini_instruments
 import os
 
+import numpy as np
+
+
+FLOAT_TYPES = (float, np.float32, np.float64)
+
 THIS_DIR = os.path.dirname(__file__)
 
 from .lut_descriptors import fixture_data as descriptors_fixture_data
@@ -40,7 +45,12 @@ def test_descriptor(instr, filename, descriptor, value):
         assert method() is None
     else:
         mvalue = method()
-        if float in (type(value), type(mvalue)):
+        if type(value) in FLOAT_TYPES or type(mvalue) in FLOAT_TYPES:
             assert abs(mvalue - value) < 0.0001
-        else:
-            assert value == mvalue
+        elif isinstance(value, list):
+            assert len(value) == len(mvalue)
+            for v, mv in zip(value, mvalue):
+                if type(v) in FLOAT_TYPES or type(mv) in FLOAT_TYPES:
+                    assert abs(mv - v) < 0.0001
+                else:
+                    assert v == mv