[1488] Support frequency nominal dim in consolidate functions

echopype/consolidate/api.py

@@ -206,7 +206,8 @@ def add_depth(
             echo_range_scaling = ek_use_platform_angles(echodata["Platform"], ds["ping_time"])
         elif use_beam_angles:
             # Identify beam group name by checking channel values of `ds`
-            if echodata["Sonar/Beam_group1"]["channel"].equals(ds["channel"]):
+            dim_0 = list(ds.sizes.keys())[0]
+            if echodata["Sonar/Beam_group1"][dim_0].equals(ds[dim_0]):
                 beam_group_name = "Beam_group1"
             else:
                 beam_group_name = "Beam_group2"
@@ -455,12 +456,14 @@ def add_splitbeam_angle(
     # and obtain the echodata group path corresponding to encode_mode
     ed_beam_group = retrieve_correct_beam_group(echodata, waveform_mode, encode_mode)
 
-    # check that source_Sv at least has a channel dimension
-    if "channel" not in source_Sv.variables:
-        raise ValueError("The input source_Sv Dataset must have a channel dimension!")
+    dim_0 = list(source_Sv.sizes.keys())[0]
 
-    # Select ds_beam channels from source_Sv
-    ds_beam = echodata[ed_beam_group].sel(channel=source_Sv["channel"].values)
+    if dim_0 in ["channel", "frequency_nominal"]:
+        ds_beam = echodata[ed_beam_group].sel({dim_0: source_Sv[dim_0].values})
+    else:
+        raise ValueError(
+            "The input source_Sv Dataset must have a channel or frequency_nominal dimension!"
+        )
 
     # Assemble angle param dict
     angle_param_list = [
@@ -479,8 +482,7 @@ def add_splitbeam_angle(
     # fail if source_Sv and ds_beam do not have the same lengths
     # for ping_time, range_sample, and channel
     same_size_lens = [
-        ds_beam.sizes[dim] == source_Sv.sizes[dim]
-        for dim in ["channel", "ping_time", "range_sample"]
+        ds_beam.sizes[dim] == source_Sv.sizes[dim] for dim in [dim_0, "ping_time", "range_sample"]
     ]
     if not same_size_lens:
         raise ValueError(
@@ -500,7 +502,7 @@ def add_splitbeam_angle(
         if pulse_compression:  # with pulse compression
             # put receiver fs into the same dict for simplicity
             pc_params = get_filter_coeff(
-                echodata["Vendor_specific"].sel(channel=source_Sv["channel"].values)
+                echodata["Vendor_specific"].sel({dim_0: source_Sv[dim_0].values})
             )
             pc_params["receiver_sampling_frequency"] = source_Sv["receiver_sampling_frequency"]
             theta, phi = get_angle_complex_samples(ds_beam, angle_params, pc_params)

echopype/consolidate/split_beam_angle.py

@@ -210,18 +210,19 @@ def get_angle_complex_samples(
     else:
         # beam_type different for some channels, process each channel separately
         theta, phi = [], []
-        for ch_id in bs["channel"].data:
+        dim_0 = list(bs.sizes.keys())[0]
+        for ch_id in bs[dim_0].data:
             theta_ch, phi_ch = _compute_angle_from_complex(
-                bs=bs.sel(channel=ch_id),
+                bs=bs.sel({dim_0: ch_id}),
                 # beam_type is not time-varying
-                beam_type=(ds_beam["beam_type"].sel(channel=ch_id)),
+                beam_type=(ds_beam["beam_type"].sel({dim_0: ch_id})),
                 sens=[
-                    angle_params["angle_sensitivity_alongship"].sel(channel=ch_id),
-                    angle_params["angle_sensitivity_athwartship"].sel(channel=ch_id),
+                    angle_params["angle_sensitivity_alongship"].sel({dim_0: ch_id}),
+                    angle_params["angle_sensitivity_athwartship"].sel({dim_0: ch_id}),
                 ],
                 offset=[
-                    angle_params["angle_offset_alongship"].sel(channel=ch_id),
-                    angle_params["angle_offset_athwartship"].sel(channel=ch_id),
+                    angle_params["angle_offset_alongship"].sel({dim_0: ch_id}),
+                    angle_params["angle_offset_athwartship"].sel({dim_0: ch_id}),
                 ],
             )
             theta.append(theta_ch)
@@ -231,15 +232,15 @@ def get_angle_complex_samples(
         theta = xr.DataArray(
             data=theta,
             coords={
-                "channel": bs["channel"],
+                dim_0: bs[dim_0],
                 "ping_time": bs["ping_time"],
                 "range_sample": bs["range_sample"],
             },
         )
         phi = xr.DataArray(
             data=phi,
             coords={
-                "channel": bs["channel"],
+                dim_0: bs[dim_0],
                 "ping_time": bs["ping_time"],
                 "range_sample": bs["range_sample"],
             },