308 image comparing tool

docs/api.rst

@@ -16,3 +16,4 @@ Under development.
    _api/autoapi/astrohack/extract_locit/index
    _api/autoapi/astrohack/locit/index
    _api/autoapi/astrohack/cassegrain_ray_tracing/index
+   _api/autoapi/astrohack/image_comparison_tool/index

src/astrohack/__init__.py

@@ -14,6 +14,7 @@
 from .locit import *
 from .extract_locit import *
 from .cassegrain_ray_tracing import *
+from .image_comparison_tool import *
 
 # This installs a slick, informational tracebacks logger
 from rich.traceback import install

src/astrohack/antenna/antenna_surface.py

@@ -14,7 +14,7 @@
 from astrohack.visualization.plot_tools import well_positioned_colorbar, create_figure_and_axes, close_figure, \
     get_proper_color_map
 
-from astrohack.utils.fits import write_fits, resolution_to_fits_header, axis_to_fits_header
+from astrohack.utils.fits import write_fits, put_resolution_in_fits_header, put_axis_in_fits_header
 
 lnbr = "\n"
 SUPPORTED_POL_STATES = ['I', 'RR', 'LL', 'XX', 'YY']
@@ -172,7 +172,7 @@ def _read_xds(self, inputxds):
     def _define_amp_clip(self, clip_type, clip_level):
         self.amplitude_noise = np.where(self.base_mask, np.nan, self.amplitude)
         if clip_type is None or clip_type == 'none':
-            clip = -np.inf
+            clip = np.nanmin(self.amplitude)
         elif clip_type == 'relative':
             clip = clip_level * np.nanmax(self.amplitude)
         elif clip_type == 'absolute':
@@ -303,7 +303,7 @@ def _create_aperture_mask(self, clip_type, clip_level, exclude_shadows):
             arm_angle = 0.0
 
         self.base_mask, self.rad, self.phi = create_aperture_mask(self.u_axis, self.v_axis, self.telescope.inlim,
-                                                                  self.telescope.diam/2,
+                                                                  self.telescope.oulim,
                                                                   arm_width=arm_width,
                                                                   arm_angle=arm_angle,
                                                                   return_polar_meshes=True)
@@ -865,9 +865,9 @@ def export_to_fits(self, basename):
             'WAVELENG': self.wavelength,
             'FREQUENC': clight / self.wavelength,
         }
-        head = axis_to_fits_header(head, self.u_axis, 1, 'X----LIN', 'm')
-        head = axis_to_fits_header(head, self.v_axis, 2, 'Y----LIN', 'm')
-        head = resolution_to_fits_header(head, self.resolution)
+        head = put_axis_in_fits_header(head, self.u_axis, 1, 'X----LIN', 'm')
+        head = put_axis_in_fits_header(head, self.v_axis, 2, 'Y----LIN', 'm')
+        head = put_resolution_in_fits_header(head, self.resolution)
 
         write_fits(head, 'Amplitude', self.amplitude, add_prefix(basename, 'amplitude') + '.fits', self.amp_unit,
                    'panel')

src/astrohack/antenna/telescope.py

@@ -110,9 +110,19 @@ def write(self, filename):
         Args:
             filename: Name of the output file
         """
-        ledict = vars(self)
+        obj_dict = vars(self)
         xds = xr.Dataset()
-        xds.attrs = ledict
+        xds.attrs = obj_dict
+        xds.to_zarr(filename, mode="w", compute=True, consolidated=True)
+        return
+
+    def _save_to_dist(self):
+        obj_dict = vars(self)
+        filename = f'{self.filepath}/{self.filename}'
+        obj_dict.pop('filepath', None)
+        obj_dict.pop('filename', None)
+        xds = xr.Dataset()
+        xds.attrs = obj_dict
         xds.to_zarr(filename, mode="w", compute=True, consolidated=True)
         return
 
@@ -139,7 +149,7 @@ def print(self):
 
     def __repr__(self):
         outstr = ''
-        ledict = vars(self)
-        for key, item in ledict.items():
+        obj_dict = vars(self)
+        for key, item in obj_dict.items():
             outstr += f"{key:20s} = {str(item)}\n"
         return outstr

src/astrohack/config/image_comparison_tool.param.json

@@ -0,0 +1,85 @@
+{
+    "compare_fits_images":{
+        "image":{
+            "nullable": false,
+            "required": true,
+            "struct_type": ["str"],
+            "type": ["string", "list"]
+        },
+        "reference_image":{
+            "nullable": false,
+            "required": true,
+            "struct_type": ["str"],
+            "type": ["string", "list"]
+        },
+        "telescope_name":{
+            "nullable": false,
+            "required": true,
+            "type": ["string"]
+        },
+        "destination":{
+            "nullable": false,
+            "required": true,
+            "type": ["string"]
+        },
+        "comparison":{
+            "allowed": ["direct", "scaled"],
+            "nullable": false,
+            "required": false,
+            "type": ["string"]
+        },
+        "zarr_container_name":{
+            "nullable": true,
+            "required": false,
+            "type": ["string"]
+        },
+        "plot_data":{
+            "nullable": false,
+            "required": false,
+            "type": ["boolean"]
+        },
+        "plot_percentuals":{
+            "nullable": false,
+            "required": false,
+            "type": ["boolean"]
+        },
+        "plot_divided_image":{
+            "nullable": false,
+            "required": false,
+            "type": ["boolean"]
+        },
+        "plot_scatter":{
+            "nullable": false,
+            "required": false,
+            "type": ["boolean"]
+        },
+        "export_to_fits":{
+            "nullable": false,
+            "required": false,
+            "type": ["boolean"]
+        },
+        "colormap":{
+            "nullable": false,
+            "required": false,
+            "type": ["string"],
+            "check allowed with": "colormaps"
+        },
+        "dpi":{
+            "nullable": false,
+            "required": false,
+            "type": ["int"],
+            "min": 1,
+            "max": 1200
+        },
+        "display":{
+            "nullable": false,
+            "required": false,
+            "type": ["boolean"]
+        },
+        "parallel":{
+            "nullable": false,
+            "required": false,
+            "type": ["boolean"]
+        }
+    }
+}