Add Nortek configuration details to dataset attributes (#106)

* Return all attributes * Organizing attributes by instrument * Update test files
lkilcher · Jul 8, 2022 · fc0df62 · fc0df62
1 parent 574abf9
commit fc0df62
Show file tree

Hide file tree

Showing 34 changed files with 190 additions and 175 deletions.
diff --git a/changelog.md b/changelog.md
@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
     - Bugfixes
 	    - Added ability to detect missing timestamps in ADV data
 
+	- API/Useability
+	    - Added classic Nortek instrument configuration details into dataset attributes
+
 ## Version 1.0.1
 	- Bugfixes:
 		- ADV and TRDI correlation and amplitude 'dir' dimension values

diff --git a/dolfyn/io/nortek.py b/dolfyn/io/nortek.py
diff --git a/dolfyn/tests/data/AWAC_test01.nc b/dolfyn/tests/data/AWAC_test01.nc
diff --git a/dolfyn/tests/data/AWAC_test01_clean.nc b/dolfyn/tests/data/AWAC_test01_clean.nc
diff --git a/dolfyn/tests/data/AWAC_test01_earth2inst.nc b/dolfyn/tests/data/AWAC_test01_earth2inst.nc
diff --git a/dolfyn/tests/data/AWAC_test01_earth2principal.nc b/dolfyn/tests/data/AWAC_test01_earth2principal.nc
diff --git a/dolfyn/tests/data/AWAC_test01_inst2beam.nc b/dolfyn/tests/data/AWAC_test01_inst2beam.nc
diff --git a/dolfyn/tests/data/AWAC_test01_ud.nc b/dolfyn/tests/data/AWAC_test01_ud.nc
diff --git a/dolfyn/tests/data/H-AWAC_test01.nc b/dolfyn/tests/data/H-AWAC_test01.nc
diff --git a/dolfyn/tests/data/burst_mode01.nc b/dolfyn/tests/data/burst_mode01.nc
diff --git a/dolfyn/tests/data/dat_vec.mat b/dolfyn/tests/data/dat_vec.mat
diff --git a/dolfyn/tests/data/vector_data01.nc b/dolfyn/tests/data/vector_data01.nc
diff --git a/dolfyn/tests/data/vector_data01_GN.nc b/dolfyn/tests/data/vector_data01_GN.nc
diff --git a/dolfyn/tests/data/vector_data01_avg.nc b/dolfyn/tests/data/vector_data01_avg.nc
diff --git a/dolfyn/tests/data/vector_data01_bin.nc b/dolfyn/tests/data/vector_data01_bin.nc
diff --git a/dolfyn/tests/data/vector_data01_rclean.nc b/dolfyn/tests/data/vector_data01_rclean.nc
diff --git a/dolfyn/tests/data/vector_data01_rotate_earth2principal.nc b/dolfyn/tests/data/vector_data01_rotate_earth2principal.nc
diff --git a/dolfyn/tests/data/vector_data01_rotate_inst2beam.nc b/dolfyn/tests/data/vector_data01_rotate_inst2beam.nc
diff --git a/dolfyn/tests/data/vector_data01_rotate_inst2earth.nc b/dolfyn/tests/data/vector_data01_rotate_inst2earth.nc
diff --git a/dolfyn/tests/data/vector_data01_sclean.nc b/dolfyn/tests/data/vector_data01_sclean.nc
diff --git a/dolfyn/tests/data/vector_data01_u.nc b/dolfyn/tests/data/vector_data01_u.nc
diff --git a/dolfyn/tests/data/vector_data_imu01-json.nc b/dolfyn/tests/data/vector_data_imu01-json.nc
diff --git a/dolfyn/tests/data/vector_data_imu01-json_mc.nc b/dolfyn/tests/data/vector_data_imu01-json_mc.nc
diff --git a/dolfyn/tests/data/vector_data_imu01.nc b/dolfyn/tests/data/vector_data_imu01.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_GN.nc b/dolfyn/tests/data/vector_data_imu01_GN.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_head_pitch_roll.nc b/dolfyn/tests/data/vector_data_imu01_head_pitch_roll.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_mc.nc b/dolfyn/tests/data/vector_data_imu01_mc.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_mcDeclin10.nc b/dolfyn/tests/data/vector_data_imu01_mcDeclin10.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_mcsp.nc b/dolfyn/tests/data/vector_data_imu01_mcsp.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_rotate_earth2principal.nc b/dolfyn/tests/data/vector_data_imu01_rotate_earth2principal.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_rotate_inst2beam.nc b/dolfyn/tests/data/vector_data_imu01_rotate_inst2beam.nc
diff --git a/dolfyn/tests/data/vector_data_imu01_rotate_inst2earth.nc b/dolfyn/tests/data/vector_data_imu01_rotate_inst2earth.nc
diff --git a/dolfyn/tests/make_data.py b/dolfyn/tests/make_data.py
@@ -23,7 +23,6 @@
 # adpr.test_io_nortek(make_data=True)
 # adpr.test_io_nortek2(make_data=True)
 # adpr.test_nortek2_crop(make_data=True)
-# io.test_save(make_data=True)
 # io.test_matlab_io(make_data=True)
 # io.test_debugging(make_data=True)
 

diff --git a/dolfyn/tests/test_time.py b/dolfyn/tests/test_time.py
@@ -15,10 +15,10 @@ def test_time_conversion():
     dt_off = time.epoch2date(time.dt642epoch(td.time), offset_hr=-7)
     t_str = time.epoch2date(time.dt642epoch(td.time), to_str=True)
 
-    assert_equal(dt[0], datetime(2012, 6, 12, 12, 0, 2, 687282))
-    assert_equal(dt1, [datetime(2012, 6, 12, 12, 0, 2, 687282)])
-    assert_equal(dt_off[0], datetime(2012, 6, 12, 5, 0, 2, 687282))
-    assert_equal(t_str[0], '2012-06-12 12:00:02.687282')
+    assert_equal(dt[0], datetime(2012, 6, 12, 12, 0, 2, 687283))
+    assert_equal(dt1, [datetime(2012, 6, 12, 12, 0, 2, 687283)])
+    assert_equal(dt_off[0], datetime(2012, 6, 12, 5, 0, 2, 687283))
+    assert_equal(t_str[0], '2012-06-12 12:00:02.687283')
 
     # Validated based on data in ad2cp.index file
     assert_equal(time.dt642date(dat_sig.time[0])[0],