search

lkilcher / dolfyn

A library for oceanographic doppler instruments such as Acoustic Doppler Profilers (ADPs, ADCPs) and Acoustic Doppler Velocimeters (ADVs).
BSD 3-Clause "New" or "Revised" License
41 stars 25 forks source link

TRDI reader updates #109

Closed jmcvey3 closed 1 year ago

jmcvey3 commented 1 year ago

Large update that includes bugfixes for reading VMDAS datafiles (subsuming fixes from PR #92), the ability to read NMEA string data (and bugfixes to skip bad profiles) stored from Winriver2, and small structure updates given the latest PDDecoder SDK released by TRDI. Full changes are listed in the changelog.

coveralls commented 1 year ago

Pull Request Test Coverage Report for Build 3643168823

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

Changes Missing Coverage Covered Lines Changed/Added Lines %
dolfyn/io/base.py 7 8 87.5%
dolfyn/tests/test_read_adv.py 2 3 66.67%
dolfyn/adp/clean.py 13 15 86.67%
dolfyn/tests/test_read_adp.py 7 9 77.78%
dolfyn/tests/test_read_io.py 19 23 82.61%
dolfyn/io/nortek2.py 11 16 68.75%
dolfyn/io/rdi_defs.py 55 61 90.16%
dolfyn/io/nortek.py 26 34 76.47%
dolfyn/io/rdi.py 485 605 80.17%
<!-- Total: 632 781 80.92% -->
Files with Coverage Reduction New Missed Lines %
dolfyn/io/base.py 1 92.57%
dolfyn/tests/test_read_io.py 1 88.16%
dolfyn/io/rdi.py 2 83.2%
dolfyn/adp/clean.py 4 94.34%
dolfyn/tests/test_read_adp.py 6 80.8%
<!-- Total: 14 -->
Totals Coverage Status
Change from base Build 3622235634: -0.8%
Covered Lines: 5003
Relevant Lines: 5562
💛 - Coveralls
jmcvey3 commented 1 year ago

@jklymak can you please provide a sample of VMDAS data (from #92, with the misplaced navigation header and/or interleaved nb and bb pings ) so I can add it to the test data suite and finish this pull request?

jmcvey3 commented 1 year ago

@jklymak Pinging you again if you can upload a clip of VMDAS test data

jklymak commented 1 year ago

My sincere apologies for being so slow in responding to your request.

https://ocean-physics.seos.uvic.ca/~jklymak/ExampleADCP/

has some files that I believe are inter-leaved ADCP data. Part of my slowness was not being sure what was in each file. If those don't suit, I can make the whole dataset available. I actually ended up making more modifications to get these to read cleanly, but perhaps you have managed those yourselves.

Thanks!

jmcvey3 commented 1 year ago

No worries at all, bad timing on my part on when to close this PR.

To just get this to run through the most recent code, I only needed to add a line to skip bytes for id's 12496 and 12504. I couldn't find documentation to decode these, though I'm not very familiar with ocean surveyors.