address review comments

Author: bhazelton

src/pyuvdata/utils/tools.py

@@ -691,11 +691,11 @@ def _ntimes_to_nblts(uvd):
     return np.asarray(inds)
 
 
-def flt_ind_str_arr(
+def float_int_to_str_array(
     *,
     fltarr: FloatArray,
     intarr: IntArray,
-    flt_tols: tuple[float, float],
+    flt_tol: tuple[float, float],
     flt_first: bool = True,
 ) -> StrArray:
     """
@@ -707,8 +707,10 @@ def flt_ind_str_arr(
         float array to be used in output string array
     intarr : np.ndarray of int
         integer array to be used in output string array
-    flt_tols : 2-tuple of float
-        Tolerances (relative, absolute) to use in formatting the floats as strings.
+    flt_tol : 2-tuple of float
+        Absolute tolerance to use in formatting the floats as strings. Note that
+        this is converted to a decimal place for print formatting, so the precision
+        might be slightly higher.
     flt_first : bool
         Whether to put the float first in the out put string or not (if False
         the int comes first.)
@@ -718,8 +720,18 @@ def flt_ind_str_arr(
     np.ndarray of str
         String array that combines the float and integer values, useful for matching.
 
+    Examples
+    --------
+    >>> float_int_to_str_array(fltarr=[np.pi, np.pi/2], intarr=[1, 2], flt_tol=.01)
+    array(['3.14_00000001', '1.57_00000002'], dtype='<U13')
+
+    >>> float_int_to_str_array(
+    ...     fltarr=[np.pi, np.pi/2], intarr=[1, 2], flt_tol=.001, flt_first=False
+    ... )
+    array(['00000001_3.142', '00000002_1.571'], dtype='<U14')
+
     """
-    prec_flt = -2 * np.floor(np.log10(flt_tols[-1])).astype(int)
+    prec_flt = -1 * np.floor(np.log10(flt_tol)).astype(int)
     prec_int = 8
     flt_str_list = ["{1:.{0}f}".format(prec_flt, flt) for flt in fltarr]
     int_str_list = [str(intv).zfill(prec_int) for intv in intarr]

src/pyuvdata/uvbase.py

@@ -755,9 +755,14 @@ def copy(self):
         """
         return copy.deepcopy(self)
 
-    def _get_param_axis(self, axis_name: str, single_named_axis: bool = False):
+    def _get_uvparam_axis(self, axis_name: str, single_named_axis: bool = False):
         """
-        Get a mapping of parameters that have a given axis to the axis number.
+        Get a mapping of properties that have a given axis to the axis number.
+
+        This uses the forms of the UVParameter attributes on this object to identify
+        properties derived from UVParameters that have one or more axes associated
+        with the axis_name. Any properties with an associated axis appear as keys
+        in the output dict, with the values giving the associated axis numbers.
 
         Parameters
         ----------
@@ -770,9 +775,28 @@ def _get_param_axis(self, axis_name: str, single_named_axis: bool = False):
         -------
         dict
             The keys are UVParameter names that have an axis with axis_name
-            (axis_name appears in their form). The values are a list of the axis
+            (axis_name appears in their form). The values are an array of the axis
             indices where axis_name appears in their form.
 
+        Examples
+        --------
+        >>> from pyuvdata import UVData
+        >>> from pyuvdata.datasets import fetch_data
+        >>> filename = fetch_data("vla_casa_tutorial_uvfits")
+        >>> uvd = UVData.from_file(filename)
+        >>> uvd._get_uvparam_axis("Nfreqs")
+        {'channel_width': array([0]),
+         'data_array': array([1]),
+         'flag_array': array([1]),
+         'flex_spw_id_array': array([0]),
+         'freq_array': array([0]),
+         'nsample_array': array([1])}
+
+        >>> uvd._get_uvparam_axis("Nfreqs", single_named_axis=True)
+        {'channel_width': array([0]),
+         'flex_spw_id_array': array([0]),
+         'freq_array': array([0])}
+
         """
         ret_dict = {}
         for param in self:
@@ -871,7 +895,7 @@ def _axis_add_helper(
         self,
         other,
         axis_name: str,
-        other_inds: IntArray,
+        other_inds: IntArray | None = None,
         final_order: IntArray | None = None,
     ):
         """
@@ -883,13 +907,14 @@ def _axis_add_helper(
             The UVBase object to be added.
         axis_name : str
             The axis name (e.g. "Nblts", "Npols").
-        other_inds : np.ndarray of int
-            Indices into the other object along this axis to include.
-        final_order : np.ndarray of int
+        other_inds : np.ndarray of int, optional
+            Indices into the other object along this axis to include. If None,
+            include all indices.
+        final_order : np.ndarray of int, optional
             Final ordering array giving the sort order after concatenation.
 
         """
-        update_params = self._get_param_axis(axis_name, single_named_axis=True)
+        update_params = self._get_uvparam_axis(axis_name, single_named_axis=True)
         other_form_dict = {axis_name: other_inds}
         for param, axis_list in update_params.items():
             axis = axis_list[0]
@@ -917,7 +942,7 @@ def _axis_pad_helper(self, axis_name: str, add_len: int):
             The extra length to be padded on for this axis.
 
         """
-        update_params = self._get_param_axis(axis_name)
+        update_params = self._get_uvparam_axis(axis_name)
         multi_axis_params = self._get_multi_axis_params()
         for param, axis_list in update_params.items():
             if param not in multi_axis_params:
@@ -987,7 +1012,7 @@ def _axis_fast_concat_helper(self, other, axis_name: str):
         axis_name : str
             The axis name (e.g. "Nblts", "Npols").
         """
-        update_params = self._get_param_axis(axis_name)
+        update_params = self._get_uvparam_axis(axis_name)
         for param, axis_list in update_params.items():
             axis = axis_list[0]
             setattr(

src/pyuvdata/uvdata/uvdata.py

@@ -5366,19 +5366,19 @@ def fix_phase(self, *, use_ant_pos=True):
 
     def blt_str_arr(self) -> StrArray:
         """Create a string array with baseline and time info for matching purposes."""
-        return utils.tools.flt_ind_str_arr(
+        return utils.tools.float_int_to_str_array(
             fltarr=self.time_array,
             intarr=self.baseline_array,
-            flt_tols=self._time_array.tols,
+            flt_tol=self._time_array.tols[1] * 0.1,
             flt_first=True,
         )
 
     def spw_freq_str_arr(self) -> StrArray:
         """Create a string array with spw and freq info for matching purposes."""
-        return utils.tools.flt_ind_str_arr(
+        return utils.tools.float_int_to_str_array(
             fltarr=self.freq_array,
             intarr=self.flex_spw_id_array,
-            flt_tols=self._freq_array.tols,
+            flt_tol=self._freq_array.tols[1] * 0.1,
             flt_first=False,
         )
 
@@ -5551,7 +5551,7 @@ def __add__(
         for axis, info in axis_info.items():
             # get parameters for compatibility checking. Exclude multidimensional
             # parameters which are handled separately later.
-            params_this_axis = this._get_param_axis(axis, single_named_axis=True)
+            params_this_axis = this._get_uvparam_axis(axis, single_named_axis=True)
             info["check_params"] = []
             for param in params_this_axis:
                 # Also exclude parameters that define overlap
@@ -6058,7 +6058,7 @@ def fast_concat(
         # figure out what parameters to check for compatibility -- only worry
         # about single axis params
         for _, info in axis_info.items():
-            params_this_axis = this._get_param_axis(
+            params_this_axis = this._get_uvparam_axis(
                 info["shape"], single_named_axis=True
             )
             info["check_params"] = []