From 514e37b42b58fb53cb1ed861c1398d691411b6cb Mon Sep 17 00:00:00 2001 From: Christopher Wingard Date: Thu, 14 Nov 2019 11:34:55 -0800 Subject: [PATCH] Updates based upon feedback in PR15 --- ion_functions/data/adcp_functions.py | 2 +- ion_functions/data/perf/test_adcp_performance.py | 2 -- ion_functions/data/test/test_adcp_functions.py | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ion_functions/data/adcp_functions.py b/ion_functions/data/adcp_functions.py index 960769a..206446f 100755 --- a/ion_functions/data/adcp_functions.py +++ b/ion_functions/data/adcp_functions.py @@ -766,7 +766,7 @@ def vadcp_beam_vertical_true(b1, b2, b3, b4, b5, pg1, pg2, pg3, pg4, pg5, h, p, pg2 = percent good estimate for beam 2 [percent] pg3 = percent good estimate for beam 3 [percent] pg4 = percent good estimate for beam 4 [percent] - pg5 = percent good estimate for beam 4 [percent] + pg5 = percent good estimate for beam 5 [percent] h = instrument's uncorrected magnetic heading [cdegrees] p = instrument pitch [cdegrees] r = instrument roll [cdegrees] diff --git a/ion_functions/data/perf/test_adcp_performance.py b/ion_functions/data/perf/test_adcp_performance.py index 6cb401e..926e075 100644 --- a/ion_functions/data/perf/test_adcp_performance.py +++ b/ion_functions/data/perf/test_adcp_performance.py @@ -83,7 +83,6 @@ def test_adcp_beam_eastward(self): vf = np.repeat(self.orient, 10000) lat = np.repeat(self.lat, 10000) lon = np.repeat(self.lon, 10000) - z = np.repeat(self.depth, 10000) dt = np.repeat(self.ntp, 10000) self.profile(stats, af.adcp_beam_eastward, b1, b2, b3, b4, pg1, pg2, pg3, pg4, h, p, r, vf, lat, lon, dt) @@ -107,7 +106,6 @@ def test_adcp_beam_northward(self): vf = np.repeat(self.orient, 10000) lat = np.repeat(self.lat, 10000) lon = np.repeat(self.lon, 10000) - z = np.repeat(self.depth, 10000) dt = np.repeat(self.ntp, 10000) self.profile(stats, af.adcp_beam_northward, b1, b2, b3, b4, pg1, pg2, pg3, pg4, h, p, r, vf, lat, lon, dt) diff --git a/ion_functions/data/test/test_adcp_functions.py b/ion_functions/data/test/test_adcp_functions.py index 2c54314..220a299 100644 --- a/ion_functions/data/test/test_adcp_functions.py +++ b/ion_functions/data/test/test_adcp_functions.py @@ -36,10 +36,10 @@ def setUp(self): self.b3 = np.array([[-398, -436, -131, -473, -443, 188, -168, 291, -179, 8]]) self.b4 = np.array([[-216, -605, -92, -58, 484, -5, 338, 175, -80, -549]]) - self.pg1 = np.array([[100, 100, 100, 24, 100, 100, 24, 100, 100, 100]]) - self.pg2 = np.array([[100, 100, 100, 100, 100, 100, 100, 24, 100, 100]]) - self.pg3 = np.array([[100, 100, 100, 100, 100, 100, 100, 100, 24, 100]]) - self.pg4 = np.array([[100, 100, 100, 24, 100, 100, 100, 100, 100, 24]]) + self.pg1 = np.array([[100, 100, 26, 24, 25, 25, 24, 26, 100, 100]]) + self.pg2 = np.array([[100, 100, 90, 80, 60, 50, 100, 24, 25, 26]]) + self.pg3 = np.array([[26, 100, 100, 90, 80, 70, 60, 50, 24, 25]]) + self.pg4 = np.array([[25, 26, 100, 24, 25, 26, 100, 100, 100, 24]]) self.echo = np.array([[0, 25, 50, 75, 100, 125, 150, 175, 200, 225, 250]])