check map units on instantiation

Author: Thomas Morris

maria/map/base.py

@@ -65,7 +65,12 @@ def __init__(
         dtype: type = np.float32,
     ):
         # check that map units are valid
-        parse_units(units)
+        u = parse_units(units)
+
+        if u["physical_quantity"] not in MAP_DIMENSIONS:
+            raise ValueError(
+                f"Units '{units}' (with associated physical quantity '{u['physical_quantity']}') are not valid map units"
+            )
 
         self.units = units
         self.data = da.asarray(data).astype(dtype)
@@ -264,7 +269,7 @@ def to(self, units: str, **calibration_kwargs: Mapping):
 
         if u["physical_quantity"] not in MAP_DIMENSIONS:
             raise ValueError(
-                f"Units '{units}' (with associated quantity '{u['physical_quantity']}') are not valid map units"
+                f"Units '{units}' (with associated physical quantity '{u['physical_quantity']}') are not valid map units"
             )
 
         package = self.package().copy()

maria/tests/map/test_map_units.py

@@ -16,7 +16,7 @@
     "map_path",
     all_maps,
 )  # noqa
-def test_map_io_units(map_path):
+def test_map_units(map_path):
     m = maria.map.load(fetch(map_path))
     if "nu" not in m.dims:
         m = m.unsqueeze("nu", 150e9)
@@ -36,18 +36,3 @@ def test_map_io_units(map_path):
         assert np.allclose(new_m_fits.resolution.arcsec, m.resolution.arcsec)
 
     m.plot()
-
-
-def test_map_extend():
-    map_filename = fetch("maps/cluster1.fits")
-
-    m1 = maria.map.load(filename=map_filename, nu=90e9)
-    m2 = maria.map.load(filename=map_filename, nu=150e9)
-    m3 = maria.map.load(filename=map_filename, nu=220e9)
-
-    m4 = m1.extend([m2, m3], dim="nu").unsqueeze("stokes")
-    m5, m6 = m4.copy(), m4.copy()
-    m5.stokes = "Q"
-    m6.stokes = "U"
-
-    m4.extend([m5, m6], dim="stokes")

maria/units/physical_quantities/base.yml

@@ -121,7 +121,7 @@ temperature:
 beam:
   long_name: beam
   short_name: beam
-  math_name: beam
+  math_name: \text{beam}
   base_unit: beam
   base_unit_prefix: ""
   vector:
@@ -132,14 +132,14 @@ beam:
       aliases:
       - BEAM
       long_name: beam
-      math_name: beam
+      math_name: \text{beam}
       min_prefix_power: 0
       max_prefix_power: 0
 
 pixel:
   long_name: pixel
   short_name: pixel
-  math_name: pixel
+  math_name: \text{pixel}
   base_unit: pixel
   base_unit_prefix: ""
   vector:
@@ -150,7 +150,7 @@ pixel:
       aliases:
       - PIXEL
       long_name: pixel
-      math_name: pixel
+      math_name: \text{pixel}
       min_prefix_power: 0
       max_prefix_power: 0
 

maria/units/quantity.py

@@ -67,6 +67,7 @@ def repr_power(thing: str, power: float, math: bool = False):
         return ""
     if power == 1:
         return thing
+
     return f"{thing}^{exp_string}"