fixed typo

themachinethatgoesping · May 30, 2024 · 80224ab · 80224ab
1 parent 5dbb9de
commit 80224ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/meson.build b/meson.build
@@ -9,7 +9,7 @@ project(
   'cpp',
   license: 'MPL-2.0',
 
-  version: '0.7.0',
+  version: '0.7.1',
   default_options: ['warning_level=2', 'buildtype=release', 'cpp_std=c++20'],
   meson_version: '>=1.3.2' #first version with  clang-cl openmp support
 )

diff --git a/python/themachinethatgoesping/pingprocessing/watercolumn/echograms/echodata.py b/python/themachinethatgoesping/pingprocessing/watercolumn/echograms/echodata.py
@@ -63,7 +63,7 @@ def set_depth_extent(self, min_depths, max_depths):
 
     def add_ping_param(self, name, x_reference, y_reference, vec_x_val, vec_y_val):
         Ping.pingprocessing.core.asserts.assert_valid_argument(
-            "add_ping_param", x_reference, ["Ping number", "Ping time", "Date Time"]
+            "add_ping_param", x_reference, ["Ping number", "Ping time", "Date time"]
         )
         Ping.pingprocessing.core.asserts.assert_valid_argument(
             "add_ping_param", y_reference, ["Sample number", "Depth (m)", "Range (m)"]
@@ -91,7 +91,8 @@ def add_ping_param(self, name, x_reference, y_reference, vec_x_val, vec_y_val):
             case "Ping time":
                 comp_vec_x_val = self.ping_times
             case "Date time":
-                comp_vec_x_val = [dt.datetime.fromtimestamp(t, self.time_zone) for t in self.ping_times]
+                comp_vec_x_val = self.ping_times
+                #comp_vec_x_val = [dt.datetime.fromtimestamp(t, self.time_zone) for t in self.ping_times]
 
         # convert to to represent indices
         vec_y_val = Ping.tools.vectorinterpolators.AkimaInterpolator(vec_x_val, vec_y_val, extrapolation_mode = 'nearest')(comp_vec_x_val)
@@ -158,7 +159,7 @@ def from_pings(
         cls,
         pings,
         pss=echosounders.pingtools.PingSampleSelector(),
-        wci_value: str = "av",
+        wci_value: str = "sv/av",
         linear_mean=True,
         apply_pss_to_bottom=False,
         verbose=True,
@@ -230,6 +231,11 @@ def from_pings(
                     minslant_d.append(md)
 
             match wci_value:
+                case "sv/av":
+                    if ping.watercolumn.has_sv():
+                        wci = ping.watercolumn.get_sv(sel)
+                    else:
+                        wci = ping.watercolumn.get_av(sel)
                 case "av":
                     wci = ping.watercolumn.get_av(sel)
                 case "amp":