329 add elevation and azimuth information on txt outputs

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "astrohack"
-version = "0.7.1"
+version = "0.7.2"
 description = "Holography Antenna Commissioning Kit"
 readme = "README.md"
 requires-python = ">= 3.11, < 3.14"

src/astrohack/antenna/antenna_surface.py

@@ -140,16 +140,6 @@
         self.v_axis = inputxds.v_prime.values
         self.computephase = False
 
-        try:
-            self.resolution = inputxds.attrs["aperture_resolution"]
-        except KeyError:
-
-            logger.warning("holog image does not have resolution information")
-            logger.warning(
-                "Rerun holog with astrohack v>0.1.5 for aperture resolution information"
-            )
-            self.resolution = None
-
     def _read_panel_xds(self, inputxds):
         self.wavelength = inputxds.attrs["wavelength"]
         self.amp_unit = inputxds.attrs["amp_unit"]
@@ -171,24 +161,7 @@
         self.u_axis = inputxds.u.values
         self.v_axis = inputxds.u.values
         self.panel_distribution = inputxds["PANEL_DISTRIBUTION"].values
-        try:
-            self.amplitude_noise = inputxds["AMP_NOISE"].values
-        except KeyError:
-            logger.warning(
-                "Input panel file does not have amplitude noise information, noise statistics will be "
-                "flawed"
-            )
-            self.amplitude_noise = np.full_like(self.amplitude, np.nan)
-
-        try:
-            self.resolution = inputxds.attrs["aperture_resolution"]
-        except KeyError:
-
-            logger.warning("Input panel file does not have resolution information")
-            logger.warning(
-                "Rerun holog with astrohack v>0.1.5 for aperture resolution information"
-            )
-            self.resolution = None
+        self.amplitude_noise = inputxds["AMP_NOISE"].values
 
         if self.solved:
             self.panel_fallback = inputxds["PANEL_FALLBACK"].values
@@ -216,17 +189,18 @@
             inputxds: X array dataset
         """
         # Origin dependant reading
+
         if self.reread:
             self._read_panel_xds(inputxds)
         else:
             self._read_holog_xds(inputxds)
 
         # Common elements
-        self.antenna_name = inputxds.attrs["ant_name"]
+        self.summary = inputxds.attrs["summary"]
+        self.antenna_name = inputxds.attrs["summary"]["general"]["antenna name"]
+        self.resolution = inputxds.summary["aperture"]["resolution"]
         self.ddi = inputxds.attrs["ddi"]
-        self.label = create_dataset_label(
-            inputxds.attrs["ant_name"], inputxds.attrs["ddi"]
-        )
+        self.label = create_dataset_label(self.antenna_name, inputxds.attrs["ddi"])
 
     def _define_amp_clip(self, clip_type, clip_level):
         self.amplitude_noise = np.where(self.base_mask, np.nan, self.amplitude)
@@ -907,8 +881,6 @@
         xds = xr.Dataset()
         gains = self.gains()
         rms = self.get_rms(unit="m")
-        xds.attrs["telescope_name"] = self.telescope.name
-        xds.attrs["ant_name"] = self.antenna_name
         xds.attrs["ddi"] = self.ddi
         xds.attrs["wavelength"] = self.wavelength
         xds.attrs["amp_unit"] = self.amp_unit
@@ -919,6 +891,8 @@
         xds.attrs["fitted"] = self.fitted
         xds.attrs["aperture_resolution"] = self.resolution
         xds.attrs["pol_state"] = self.pol_state
+        xds.attrs["summary"] = self.summary
+
         xds["AMPLITUDE"] = xr.DataArray(self.amplitude, dims=["u", "v"])
         xds["PHASE"] = xr.DataArray(self.phase, dims=["u", "v"])
         xds["DEVIATION"] = xr.DataArray(self.deviation, dims=["u", "v"])

src/astrohack/antenna/base_panel.py

@@ -164,8 +164,8 @@ def plot_label(self, ax, rotate=True):
         else:
             angle = 0
         ax.text(
-            self.center.yc,
             self.center.xc,
+            self.center.yc,
             self.label,
             fontsize=fontsize,
             ha="center",
@@ -181,8 +181,8 @@ def plot_screws(self, ax):
         """
         for iscrew, screw in enumerate(self.screws):
             ax.scatter(
-                screw.yc,
                 screw.xc,
+                screw.yc,
                 marker=self.markers[iscrew],
                 lw=self.linewidth,
                 s=markersize,
@@ -208,7 +208,7 @@ def plot_corrections(self, ax, cmap, corrections, threshold, vmin, vmax):
             else:
                 corr = corrections[iscrew]
             circle = plt.Circle(
-                (screw.yc, screw.xc),
+                (screw.xc, screw.yc),
                 self.plot_screw_size,
                 color=cmap(norm(corr)),
                 fill=True,

src/astrohack/antenna/telescope.py

@@ -51,21 +51,15 @@
 
     @classmethod
     def from_xds(cls, xds):
-        if xds.attrs["telescope_name"] == "ALMA":
-            telescope_name = "_".join(
-                (xds.attrs["telescope_name"], xds.attrs["ant_name"][0:2])
-            )
+        tel_name = xds.attrs["summary"]["general"]["telescope name"]
+        if tel_name == "ALMA":
+            telescope_name = "_".join((tel_name, xds.attrs["ant_name"][0:2]))
             return cls(telescope_name)
-        elif (
-            xds.attrs["telescope_name"] == "EVLA"
-            or xds.attrs["telescope_name"] == "VLA"
-        ):
+        elif tel_name == "EVLA" or tel_name == "VLA":
             telescope_name = "VLA"
             return cls(telescope_name)
         else:
-            raise ValueError(
-                "Unsupported telescope {0:s}".format(xds.attrs["telescope_name"])
-            )
+            raise ValueError("Unsupported telescope {0:s}".format(tel_name))
 
     @staticmethod
     def _get_telescope_file_name(name):

src/astrohack/config/image_comparison_tool.param.json

@@ -63,10 +63,13 @@
             "required": false,
             "type": ["boolean"]
         },
-        "export_to_fits":{
-            "nullable": false,
+        "z_scale_limits": {
+            "nullable": true,
             "required": false,
-            "type": ["boolean"]
+            "type": ["list", "tuple", "ndarray"],
+            "struct_type": ["float"],
+            "minlength": 2,
+            "maxlength": 2
         },
         "colormap":{
             "nullable": false,
@@ -86,6 +89,11 @@
             "required": false,
             "type": ["boolean"]
         },
+        "export_to_fits":{
+            "nullable": false,
+            "required": false,
+            "type": ["boolean"]
+        },
         "parallel":{
             "nullable": false,
             "required": false,