--- a/LADCPproc
+++ b/LADCPproc
@@ -2,9 +2,9 @@
#======================================================================
# L A D C P P R O C
# doc: Thu Sep 16 20:36:10 2010
-# dlm: Thu Mar 20 12:34:04 2014
+# dlm: Tue May 20 09:01:32 2014
# (c) 2010 A.M. Thurnherr
-# uE-Info: 94 52 NIL 0 0 72 10 2 4 NIL ofnI
+# uE-Info: 96 0 NIL 0 0 72 10 2 4 NIL ofnI
#======================================================================
# NOTES:
@@ -86,12 +86,14 @@
# Sep 25, 2013: - BUG: %PARAM magnetic_declination did not have LADCPproc:: prefix
# - added CTD lat/lon info to most output files (but not BT)
# - BUG: moved %water_depth to common %PARAMs
+# Feb 22, 2014: - modified diagnostics output
# Mar 19, 2014: - moved code to set LADCP_time_lag %PARAM into main prog so it is
# set, even when -l is used
# - added pitch, roll, hdg to -t output
# Mar 20, 2014: - BUG: wrong number of samples were recorded when upcast had no
# valid data whatsoever
# - added support for $LADCP_max_gap
+# May 20, 2014: - merged laptop with whoosher versions (folded in Feb 22 change)
($ANTS) = (`which ANTSlib` =~ m{^(.*)/[^/]*$});
($PERL_TOOLS) = (`which mkProfile` =~ m{^(.*)/[^/]*$});
@@ -216,7 +218,7 @@
print(STDERR "Reading CTD data ($CTD_file)...");
readCTD($CTD_file,\%CTD);
-printf(STDERR "\n\t%d scans",scalar(@{$CTD{press}})) if ($opt_d);
+printf(STDERR "\n\t%d scans (%.1fs sample interval)",scalar(@{$CTD{press}}),$CTD{sampint}) if ($opt_d);
print(STDERR "\n");
my($year) = substr($LADCP{ENSEMBLE}[0]->{DATE},6,4);
@@ -360,7 +362,7 @@
if ($opt_d);
($LADCP_start,$LADCP_end,$LADCP_bottom,$w_gap_time,$zErr,$maxz) =
- mk_prof(\%LADCP,0,undef,1,6,70,0.1,$LADCP_max_gap);
+ mk_prof(\%LADCP,0,undef,1,6,70,0.1,$LADCP_max_gap);
croak("\n$LADCP_file: no good ensembles found\n")
unless defined($LADCP_start);
--- a/LADCPproc.UHcode
+++ b/LADCPproc.UHcode
@@ -1,9 +1,9 @@
#======================================================================
# L A D C P P R O C . U H C O D E
# doc: Fri Sep 17 20:27:53 2010
-# dlm: Tue Mar 4 13:44:48 2014
+# dlm: Tue May 20 09:05:56 2014
# (c) 2010 A.M. Thurnherr & E. Firing
-# uE-Info: 44 66 NIL 0 0 72 2 2 4 NIL ofnI
+# uE-Info: 218 15 NIL 0 0 72 2 2 4 NIL ofnI
#======================================================================
# PERLified functions from Eric's [merge.c]; with mods
@@ -210,6 +210,13 @@
}
## The following is for editing out the second bottom bounce.
+# - in the UH code, tilt = max(pitch,roll)
+# - using the real tilt (here) implies that PPI editing is too conservative
+# in case of large tilts
+# - since, however, the sound speed at the transducer is used instead
+# of the mean soundspeed below the ADCP, the difference is unlikely
+# to matter
+
sub set_PPI_flags($$)
{
my($ens,$De) = @_;
--- a/LADCPproc.defaults
+++ b/LADCPproc.defaults
@@ -1,9 +1,9 @@
#======================================================================
# L A D C P P R O C . D E F A U L T S
# doc: Fri Sep 17 09:44:21 2010
-# dlm: Thu Mar 20 12:41:41 2014
+# dlm: Tue May 20 09:07:05 2014
# (c) 2010 A.M. Thurnherr
-# uE-Info: 81 23 NIL 0 0 72 0 2 4 NIL ofnI
+# uE-Info: 278 0 NIL 0 0 72 0 2 4 NIL ofnI
#======================================================================
# default parameters for [LADCPproc]
@@ -32,7 +32,7 @@
# Sep 6, 2013: - BUG: BT_begin_search_above value of 300m was correct;
# the original bug was in the documentation
# Sep 19, 2013: - added support for $BT_range_method
-# Mar 20, 2014: - added support for $LADCP_max_gap
+# Feb 22, 2014: - added $LADCP_max_gap
#----------------------------------------------------------------------
# Data editing
@@ -47,6 +47,14 @@
# $bad_beam = 1;
+# Some ADCPs report occasional spurious velocity data while on deck.
+# The software can detect and remove many of these bad data based on
+# long gaps between subsequent valid ensembles. To turn on this heuristic,
+# reduce the value of the following varible (time in seconds) to the longest
+# LADCP gap in the data set (bottom bottle stop, large instrument tilt, etc).
+
+$LADCP_max_gap = 9999;
+
#----------------------------------------------------------------------
# ASCII CTD file support
#----------------------------------------------------------------------