added VPD for MIDAS SVX2

hydroffice · Aug 13, 2020 · 0295159 · 0295159
1 parent 416c062
commit 0295159
Show file tree

Hide file tree

Showing 10 changed files with 2,236 additions and 5 deletions.
diff --git a/data/input/valeport/midas/svx2/FILE_016_instrumet_MIDAS SVX2 .vpd b/data/input/valeport/midas/svx2/FILE_016_instrumet_MIDAS SVX2 .vpd
diff --git a/data/input/valeport/midas/svx2/SV 31.07.20.000 b/data/input/valeport/midas/svx2/SV 31.07.20.000
diff --git a/docs/conf.py b/docs/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '2020.0'
 # The full version, including alpha/beta/rc tags.
-release = '2020.0.5'
+release = '2020.0.6'
 
 numfig = True
 

diff --git a/hyo2/soundspeed/__init__.py b/hyo2/soundspeed/__init__.py
@@ -12,7 +12,7 @@
 logger.addHandler(logging.NullHandler())
 
 name = "Sound Speed"
-__version__ = '2020.0.5'
+__version__ = '2020.0.6'
 __copyright__ = 'Copyright 2020 University of New Hampshire, Center for Coastal and Ocean Mapping'
 
 lib_info = LibInfo()

diff --git a/hyo2/soundspeed/formats/readers/valeport.py b/hyo2/soundspeed/formats/readers/valeport.py
@@ -16,6 +16,7 @@ class Valeport(AbstractTextReader):
     sensor_dict = {
         Dicts.probe_types['MONITOR SVP 500']: Dicts.sensor_types["SVPT"],
         Dicts.probe_types['MIDAS SVP 6000']: Dicts.sensor_types["SVPT"],
+        Dicts.probe_types['MIDAS SVX2']: Dicts.sensor_types["SVPT"],
         Dicts.probe_types['MIDAS SVX2 100']: Dicts.sensor_types["SVPT"],
         Dicts.probe_types['MIDAS SVX2 500']: Dicts.sensor_types["SVPT"],
         Dicts.probe_types['MIDAS SVX2 1000']: Dicts.sensor_types["SVPT"],
@@ -118,6 +119,10 @@ def _vp2_header(self):
                     self.ssp.cur.meta.probe_type = Dicts.probe_types['MONITOR CTD']
                     self.ssp.cur.meta.sensor_type = self.sensor_dict[self.ssp.cur.meta.probe_type]
                     continue
+                elif tokens[1] == "MIDAS SVX2":
+                    self.ssp.cur.meta.probe_type = Dicts.probe_types['MIDAS SVX2']
+                    self.ssp.cur.meta.sensor_type = self.sensor_dict[self.ssp.cur.meta.probe_type]
+                    continue
                 else:
                     raise RuntimeError("Unknown/unsupported instrument: %s" % line)
 
@@ -152,7 +157,10 @@ def _vp2_header(self):
                 try:
                     self.ssp.cur.meta.utc_time = dt.datetime.strptime(tokens[1], "%Y/%m/%d %H:%M:%S.%f")
                 except ValueError:
-                    logger.warning("unable to parse date and time: %s" % line)
+                    try:
+                        self.ssp.cur.meta.utc_time = dt.datetime.strptime(tokens[1], "%Y.%m.%d %H:%M:%S.%f")
+                    except ValueError:
+                        logger.warning("unable to parse date and time: %s" % line)
 
         if not has_header:
             raise RuntimeError('Invalid format! Unable to locate the [HEADER] row')

diff --git a/hyo2/soundspeed/profile/dicts.py b/hyo2/soundspeed/profile/dicts.py
@@ -85,6 +85,7 @@ def first_match(cls, dct, val):
         ('SWiFT', 309),
         ('RapidSV', 310),
         ('MONITOR CTD', 311),
+        ('MIDAS SVX2', 312),
 
         ('Future', 999),
 

diff --git a/hyo2/soundspeed/profile/ray_tracing/plot_tracedprofiles.py b/hyo2/soundspeed/profile/ray_tracing/plot_tracedprofiles.py
@@ -156,6 +156,10 @@ def make_bias_plots(self):
 
         t_idx_max = max(np.nanargmax(self._d.new_rays[-1][0]),
                         np.nanargmax(self._d.old_rays[-1][0]))
+        # logger.debug('new times: %s' % (self._d.new_rays[-1][0], ))
+        # logger.debug('old times: %s' % (self._d.old_rays[-1][0], ))
+        # logger.debug('t idx max: %s' % t_idx_max)
+
         try:
             z_max = self._d.new_rays[-1][2][t_idx_max]
         except IndexError:

diff --git a/hyo2/soundspeedmanager/__init__.py b/hyo2/soundspeedmanager/__init__.py
@@ -11,7 +11,7 @@
 logger.addHandler(logging.NullHandler())
 
 name = "Sound Speed Manager"
-__version__ = "2020.0.5"
+__version__ = "2020.0.6"
 __copyright__ = "Copyright 2020 University of New Hampshire, Center for Coastal and Ocean Mapping"
 
 app_info = AppInfo()

diff --git a/hyo2/soundspeedmanager/media/manual.pdf b/hyo2/soundspeedmanager/media/manual.pdf
diff --git a/hyo2/soundspeedsettings/__init__.py b/hyo2/soundspeedsettings/__init__.py
@@ -11,7 +11,7 @@
 logger.addHandler(logging.NullHandler())
 
 name = "Sound Speed Settings"
-__version__ = '2020.0.5'
+__version__ = '2020.0.6'
 __copyright__ = 'Copyright 2020 University of New Hampshire, Center for Coastal and Ocean Mapping'
 
 app_info = AppInfo()