Added support for split-beam angle computation with mixed channel beam types in complex mode

Author: beatfactor

echopype/consolidate/split_beam_angle.py

@@ -8,8 +8,12 @@
 import numpy as np
 import xarray as xr
 
+from ..utils.log import _init_logger
 from ..calibrate.ek80_complex import compress_pulse, get_norm_fac, get_transmit_signal
 
+
+logger = _init_logger(__name__)
+
 # Beam type identifiers
 BEAM_TYPE_SPLIT_4_SECTOR = 1      # 4-sector split-beam (common Simrad type)
 BEAM_TYPE_SPLIT_3_SECTOR = 17     # 3-sector
@@ -105,7 +109,6 @@ def _compute_angle_from_complex(
         raise NotImplementedError
 
     else:
-        print("beam_type: ", beam_type)
         raise ValueError("beam_type not recognized!")
 
     theta = theta / sens[0] - offset[0]
@@ -235,7 +238,7 @@ def get_angle_complex_samples(
             beam_type_ch = ds_beam["beam_type"].sel(channel=ch_id).item()
 
             if beam_type_ch not in SUPPORTED_BEAM_TYPES:
-                print(f"Skipping channel {ch_id}: unsupported beam_type {beam_type_ch}")
+                logger.warning(f"Skipping channel {ch_id}: unsupported beam_type {beam_type_ch}")
                 continue
 
             theta_ch, phi_ch = _compute_angle_from_complex(

echopype/tests/consolidate/test_consolidate_integration.py

@@ -335,5 +335,34 @@ def test_add_splitbeam_angle_BB_pc(test_path):
     assert np.allclose(pyel_vals, ep_vals, atol=1e-6)
 
 
+def test_add_splitbeam_angle_partial_valid_channels(test_path):
+    raw_file = test_path["EK80_CAL"] / "2018115-D20181213-T094600.raw"
+    ed = ep.open_raw(raw_file, sonar_model="EK80")
+
+    # Manually override beam_type for one channel to simulate single-beam
+    beam_types = ed["Sonar/Beam_group1"]["beam_type"].values
+    total_channels = beam_types.shape[0]
+
+    # Force the first channel to an unsupported beam_type
+    beam_types[1] = 0
+    ed["Sonar/Beam_group1"]["beam_type"].data[:] = beam_types
+
+    # Compute Sv
+    ds_Sv = ep.calibrate.compute_Sv(ed, waveform_mode="CW", encode_mode="complex")
+
+    # Add split-beam angles
+    ds_Sv = ep.consolidate.add_splitbeam_angle(source_Sv=ds_Sv, echodata=ed, waveform_mode="CW",
+                                               encode_mode="complex", pulse_compression=False, to_disk=False)
+
+    valid_angle_channels = [
+        ch for ch in ds_Sv.channel.values
+        if not np.all(np.isnan(ds_Sv["angle_alongship"].sel(channel=ch)))
+    ]
+
+    # Verify angles exist for valid channel only
+    assert "angle_alongship" in ds_Sv
+    assert "angle_athwartship" in ds_Sv
+    assert len(valid_angle_channels) == total_channels - 1
+
 # TODO: need a test for power/angle data, with mock EchoData object
 # containing some channels with single-beam data and some channels with split-beam data