Index: gliderproc/trunk/gliderCurrents_Generate_L1_Data.m
===================================================================
--- gliderproc/trunk/gliderCurrents_Generate_L1_Data.m (revision 517)
+++ gliderproc/trunk/gliderCurrents_Generate_L1_Data.m (revision 518)
@@ -69,4 +69,8 @@
         vy = [];
         prior_seg_vy = [];
+        lat = [];
+        lon = [];
+        gps_lat = [];
+        gps_lon = [];
         ptime_dbd = [];
         ptime_ebd = [];
@@ -123,4 +127,16 @@
                         data.data(:,strmatch('x_prior_seg_water_vy',...
                                              data.vars, 'exact'))];
+                    lat = [lat; ...
+                        data.data(:,strmatch('m_lat',...
+                                             data.vars, 'exact'))];
+                    lon = [lon; ...
+                        data.data(:,strmatch('m_lon',...
+                                             data.vars, 'exact'))];
+                    gps_lat = [gps_lat; ...
+                        data.data(:,strmatch('m_gps_lat',...
+                                             data.vars, 'exact'))];
+                    gps_lon = [gps_lon; ...
+                        data.data(:,strmatch('m_gps_lon',...
+                                             data.vars, 'exact'))];
                     ptime_dbd = [ptime_dbd; ...
                         data.data(:,strmatch('m_present_time',...
@@ -136,6 +152,6 @@
         %*** END READ IN DBD DATA ****
         
-        % remove nans from DBD data...
-        i = find(~isnan(vx));
+        % include only not NaNs from DBD data for either vx or final_vx...
+        i = find(~(isnan(vx) & isnan(final_vx)));
         vx = vx(i);
         final_vx = final_vx(i);
@@ -148,4 +164,8 @@
         delta_vy = delta_vy(i);
         prior_seg_vy = prior_seg_vy(i);
+        lat = lat(i);
+        lon = lon(i);
+        gps_lat = gps_lat(i);
+        gps_lon = gps_lon(i);
         ptime_dbd = ptime_dbd(i);
         ptime_ebd = ptime_ebd(i);
@@ -165,4 +185,8 @@
         delta_vy = delta_vy(I);
         prior_seg_vy = prior_seg_vy(I);
+        lat = lat(I);
+        lon = lon(I);
+        gps_lat = gps_lat(I);
+        gps_lon = gps_lon(I);
         ptime_ebd = ptime_ebd(I);
 
@@ -183,4 +207,8 @@
             'delta_vy', 'm/s', ...
             'prior_seg_vy', 'm/s', ...
+            'lat', 'decimal degrees', ...
+            'lon', 'decimal degrees', ...
+            'gps_lat', 'decimal degrees', ...
+            'gps_lon', 'decimal degrees', ...
             'ptime_dbd', 'seconds since 0000-01-01T00:00', ...
             'ptime_dbd_datenum', 'days since 1970-01-01T00:00', ...
@@ -199,4 +227,8 @@
             'delta_vy', 'Change in northward water velocity', ...
             'prior_seg_vy', 'Northward water velocity of prior segment', ...
+            'lat', 'north/south vehicle position', ...
+            'lon', 'east/west vehicle position', ...
+            'gps_lat', 'GPS fix latitude', ...
+            'gps_lon', 'GPS fix longitude', ...
             'ptime_dbd', 'flight computer time', ...
             'ptime_dbd_datenum', 'flight computer date', ...
@@ -227,4 +259,8 @@
              'delta_vy', ...
              'prior_seg_vy', ...
+             'lat', ...
+             'lon', ...
+             'gps_lat', ...
+             'gps_lon', ...
              'ptime_dbd', ...
              'ptime_dbd_datenum', ...