Skip to content

Commit 409822d

Browse files
authored
Fix ever-changing RDI RiverPro depth bin ranges (#378)
Partial solution for Issue #368. Fixes an issue with a changing `bin1_dist_m` attribute, which was presumed constant before. Also solves an issue with changing surface layer cell sizes. The RDI reader will now also explicitly return the `range_offset` that the user programmed into the instrument.
1 parent c0f22b9 commit 409822d

21 files changed

+136
-99
lines changed
145 Bytes
Binary file not shown.
-160 Bytes
Binary file not shown.
145 Bytes
Binary file not shown.
146 Bytes
Binary file not shown.
-104 Bytes
Binary file not shown.
-104 Bytes
Binary file not shown.
-104 Bytes
Binary file not shown.
-104 Bytes
Binary file not shown.

examples/data/dolfyn/test_data/RDI_withBT.dolfyn.log

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ root - INFO - cfgid0: [7f, 7f]
33
root - INFO - {'nbyte': 579, 'dat_offsets': array([ 20, 79, 144, 282, 352, 422, 492])}
44
root - INFO - pos 20
55
root - INFO - id 0 offset 20
6-
root - INFO - Number of cells set to 17
7-
root - INFO - Cell size set to 1.0
6+
root - DEBUG - Number of cells set to 17
7+
root - DEBUG - Cell size set to 1.0
8+
root - DEBUG - Bin 1 distance set to 2.09
89
root - INFO - Read Config
910
root - INFO - Read Fixed
1011
root - INFO - id 128 offset 79
@@ -13,9 +14,9 @@ root - INFO - id 512 offset 282
1314
root - INFO - id 768 offset 352
1415
root - INFO - id 1024 offset 422
1516
root - INFO - id 1536 offset 492
16-
root - INFO - Done: {'prog_ver': 51.41, 'inst_model': 'Workhorse', 'beam_angle': 20, 'freq': 600, 'beam_pattern': 'convex', 'orientation': 'down', 'n_beams': 4, 'n_cells': 17, 'pings_per_ensemble': 1, 'cell_size': 1.0, 'blank_dist': 0.88, 'profiling_mode': 1, 'min_corr_threshold': 64, 'n_code_reps': 5, 'min_prcnt_gd': 0, 'max_error_vel': 2.0, 'sec_between_ping_groups': 0.5, 'coord_sys': 'earth', 'use_pitchroll': 'yes', 'use_3beam': 'yes', 'bin_mapping': 'yes', 'heading_misalign_deg': 0.0, 'magnetic_var_deg': 0.0, 'sensors_src': '01111101', 'sensors_avail': '00111101', 'bin1_dist_m': 2.09, 'transmit_pulse_m': 1.18, 'water_ref_cells': [1, 5], 'false_target_threshold': 50, 'transmit_lag_m': 0.24, 'bandwidth': 0, 'power_level': 255, 'serialnum': 18655}
17-
root - INFO - self._bb False
18-
root - INFO - self.cfgbb: {}
17+
root - INFO - Done: {'prog_ver': 51.41, 'inst_make': 'TRDI', 'inst_type': 'ADCP', 'rotate_vars': ['vel'], 'has_imu': 0, 'inst_model': 'Workhorse', 'beam_angle': 20, 'freq': 600, 'beam_pattern': 'convex', 'orientation': 'down', 'n_beams': 4, 'n_cells': 17, 'pings_per_ensemble': 1, 'cell_size': 1.0, 'blank_dist': 0.88, 'profiling_mode': 1, 'min_corr_threshold': 64, 'n_code_reps': 5, 'min_prcnt_gd': 0, 'max_error_vel': 2.0, 'sec_between_ping_groups': 0.5, 'coord_sys': 'earth', 'use_pitchroll': 'yes', 'use_3beam': 'yes', 'bin_mapping': 'yes', 'heading_misalign_deg': 0.0, 'magnetic_var_deg': 0.0, 'sensors_src': '01111101', 'sensors_avail': '00111101', 'bin1_dist_m': 2.09, 'transmit_pulse_m': 1.18, 'water_ref_cells': [1, 5], 'false_target_threshold': 50, 'transmit_lag_m': 0.24, 'bandwidth': 0, 'power_level': 255, 'serialnum': 18655}
18+
root - INFO - self._BB False
19+
root - INFO - self.cfgBB: {}
1920
root - INFO - taking data from pings 0 - 1721
2021
root - INFO - 1721 ensembles will be produced.
2122

@@ -98,4 +99,3 @@ root - DEBUG - pos: 865, pos_: 0, nbyte: 138, k: 0, byte_offset: -1
9899
root - DEBUG - Trying to Read 512
99100
root - INFO - Reading code 0x200...
100101
root - INFO - Read Corr
101-
root - INFO - success!
224 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)