astrohack 1.0.1__tar.gz → 1.0.2__tar.gz

{astrohack-1.0.1/src/astrohack.egg-info → astrohack-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astrohack
-Version: 1.0.1
+Version: 1.0.2
 Summary: Holography Antenna Commissioning Kit
 Author-email: Joshua Hoskins <jhoskins@nrao.edu>, Victor de Souza Magalhaes <vdesouza@nrao.edu>, Jan-Willem Steeb <jsteeb@nrao.edu>
 Requires-Python: <3.14,>=3.11

{astrohack-1.0.1 → astrohack-1.0.2}/pyproject.toml

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

{astrohack-1.0.1 → astrohack-1.0.2}/src/astrohack/beamcut.py

@@ -2,6 +2,7 @@ import pathlib
 import numpy as np
 
 from toolviper.utils.parameter import validate
+import toolviper.utils.logger as logger
 
 from astrohack.core.beamcut import process_beamcut_chunk
 from astrohack.utils import get_default_file_name
@@ -143,6 +144,7 @@ def beamcut(
     )
     if executed_graph:
         if destination is not None:
+            logger.info("Producing plots...")
             beamcut_mds.plot_beamcut_in_amplitude(
                 destination,
                 lm_unit=lm_unit,

{astrohack-1.0.1 → astrohack-1.0.2}/src/astrohack/core/beamcut.py

@@ -398,7 +398,9 @@ def _perform_curvefit_with_given_functions(
         return False, np.full_like(initial_guesses, np.nan)
 
 
-def _identify_pb_and_sidelobes_in_fit(datalabel, x_data, fit_pars):
+def _identify_pb_and_sidelobes_in_fit(
+    datalabel, x_data, fit_pars, primary_fwhm_estimate
+):
     """
     Identify primary beam and first sidelobes in fit using expected beam shape heuristics.
 
@@ -440,7 +442,16 @@ def _identify_pb_and_sidelobes_in_fit(datalabel, x_data, fit_pars):
     i_pb_cen = np.argmin(np.abs(centers))
     # This assumes the primary beam is the strongest
     i_pb_amp = np.argmax(amps)
-    pb_problem = i_pb_cen != i_pb_amp
+
+    pb_problem = False
+    if i_pb_cen != i_pb_amp:
+        pb_problem = True
+    else:
+        if (
+            fwhms[i_pb_cen] < 0.5 * primary_fwhm_estimate
+            or fwhms[i_pb_cen] > 3.0 * primary_fwhm_estimate
+        ):
+            pb_problem = True
 
     if pb_problem:
         logger.warning(f"Cannot reliably identify primary beam for {datalabel}.")
@@ -496,20 +507,29 @@ def _beamcut_multi_lobes_gaussian_fit(cut_xdtree, datalabel):
             initial_guesses, bounds, n_peaks = _build_multi_gaussian_initial_guesses(
                 x_data, y_data, primary_fwhm
             )
-            fit_succeeded, fit_pars = _perform_curvefit_with_given_functions(
-                x_data,
-                y_data,
-                initial_guesses,
-                bounds,
-                _multi_gaussian,
-                this_corr_data_label,
-            )
+
+            # This is a test for empty data
+            if np.nansum(y_data) == 0:
+                logger.warning(
+                    f"{this_corr_data_label} appears to contain no valid data"
+                )
+                fit_succeeded = False
+                fit_pars = np.full_like(initial_guesses, np.nan)
+            else:
+                fit_succeeded, fit_pars = _perform_curvefit_with_given_functions(
+                    x_data,
+                    y_data,
+                    initial_guesses,
+                    bounds,
+                    _multi_gaussian,
+                    this_corr_data_label,
+                )
 
             if fit_succeeded:
                 fit = _multi_gaussian(x_data, *fit_pars)
                 n_peaks, fit_pars, pb_center, pb_fwhm, first_side_lobe_ratio = (
                     _identify_pb_and_sidelobes_in_fit(
-                        this_corr_data_label, x_data, fit_pars
+                        this_corr_data_label, x_data, fit_pars, primary_fwhm
                     )
                 )
             else:

{astrohack-1.0.1 → astrohack-1.0.2}/src/astrohack/io/beamcut_mds.py

@@ -718,6 +718,8 @@ def _plot_single_cut_in_amplitude(cut_xds, axes, par_dict):
     # Init
     sub_title = _make_parallel_hand_sub_title(cut_xds.attrs)
     max_amp = cut_xds.attrs["all_corr_ymax"]
+    if max_amp < 1e-2:
+        max_amp = 1.0
     y_off = 0.05 * max_amp
     lm_unit = par_dict["lm_unit"]
     lm_fac = convert_unit("rad", lm_unit, "trigonometric")
@@ -944,7 +946,11 @@ def _plot_single_cut_in_attenuation(cut_xds, ax, par_dict):
         x_data = lm_fac * cut_xds["lm_dist"].values
         amps = cut_xds[f"{parallel_hand}_amplitude"].values
         max_amp = np.max(amps)
-        y_data = to_db(amps / max_amp)
+        if max_amp == 0:
+            y_data = np.full_like(x_data, -1)
+        else:
+            y_data = to_db(amps / max_amp)
+
         y_min = np.min(y_data)
         if y_min < min_attenuation:
             min_attenuation = y_min

{astrohack-1.0.1 → astrohack-1.0.2/src/astrohack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: astrohack
-Version: 1.0.1
+Version: 1.0.2
 Summary: Holography Antenna Commissioning Kit
 Author-email: Joshua Hoskins <jhoskins@nrao.edu>, Victor de Souza Magalhaes <vdesouza@nrao.edu>, Jan-Willem Steeb <jsteeb@nrao.edu>
 Requires-Python: <3.14,>=3.11