fixed some issues with split beam angle computation

Author: beatfactor

echopype/consolidate/split_beam_angle.py

@@ -5,6 +5,7 @@
 
 from typing import List, Tuple
 
+import dask.array as da
 import numpy as np
 import xarray as xr
 
@@ -111,8 +112,12 @@ def _compute_angle_from_complex(
     else:
         raise ValueError("beam_type not recognized!")
 
-    theta = theta / sens[0] - offset[0]
-    phi = phi / sens[1] - offset[1]
+    if isinstance(sens[0].data, da.Array):
+        theta = theta / float(sens[0].values) - float(offset[0].values)
+        phi = phi / float(sens[1].values) - float(offset[1].values)
+    else:
+        theta = theta / sens[0] - offset[0]
+        phi = phi / sens[1] - offset[1]
 
     return theta, phi
 
@@ -235,16 +240,16 @@ def get_angle_complex_samples(
         # beam_type different for some channels, process each channel separately
         theta_list, phi_list, valid_channels = [], [], []
         for ch_id in bs["channel"].data:
-            beam_type_ch = ds_beam["beam_type"].sel(channel=ch_id).item()
-
-            if beam_type_ch not in SUPPORTED_BEAM_TYPES:
-                logger.warning(f"Skipping channel {ch_id}: unsupported beam_type {beam_type_ch}")
+            beam_type = ds_beam["beam_type"].sel(channel=ch_id)
+            beam_type = int(beam_type)
+            if beam_type not in SUPPORTED_BEAM_TYPES:
+                logger.warning(f"Skipping channel {ch_id}: unsupported beam_type {beam_type}")
                 continue
 
             theta_ch, phi_ch = _compute_angle_from_complex(
                 bs=bs.sel(channel=ch_id),
                 # beam_type is not time-varying
-                beam_type=(ds_beam["beam_type"].sel(channel=ch_id)),
+                beam_type=beam_type,
                 sens=[
                     angle_params["angle_sensitivity_alongship"].sel(channel=ch_id),
                     angle_params["angle_sensitivity_athwartship"].sel(channel=ch_id),
@@ -258,14 +263,22 @@ def get_angle_complex_samples(
             phi_list.append(phi_ch)
             valid_channels.append(ch_id)
 
-        if not theta_list:
-            raise ValueError("No valid channels found for angle computation.")
-
         # Combine angles from all channels
-        theta = xr.concat(theta_list, dim="channel")
-        theta = theta.assign_coords(channel=("channel", valid_channels))
-
-        phi = xr.concat(phi_list, dim="channel")
-        phi = phi.assign_coords(channel=("channel", valid_channels))
+        theta = xr.DataArray(
+            data=theta_list,
+            coords={
+                "channel": valid_channels,
+                "ping_time": bs["ping_time"],
+                "range_sample": bs["range_sample"],
+            },
+        )
+        phi = xr.DataArray(
+            data=phi_list,
+            coords={
+                "channel": valid_channels,
+                "ping_time": bs["ping_time"],
+                "range_sample": bs["range_sample"],
+            },
+        )
 
     return theta, phi