--- a/defaults.pl Sat Mar 23 13:45:31 2013 +0000
+++ b/defaults.pl Thu Nov 21 09:07:17 2013 -0500
@@ -1,9 +1,9 @@
#======================================================================
# D E F A U L T S . P L
# doc: Tue Oct 11 17:11:21 2011
-# dlm: Mon Oct 15 21:34:00 2012
+# dlm: Thu Sep 5 22:46:45 2013
# (c) 2011 A.M. Thurnherr
-# uE-Info: 26 14 NIL 0 0 72 0 2 4 NIL ofnI
+# uE-Info: 37 55 NIL 0 0 72 0 2 4 NIL ofnI
#======================================================================
# HISTORY:
@@ -25,6 +25,16 @@
# Oct 11, 2012: - added .TL output to defaults
#--- hg commit
# Oct 15, 2012: - removed support for TLhist
+# Apr 22, 2013: - removed option variable aliases
+# May 14, 2013: - opt_m => w_max_lim
+# - BUG: default processing params file was still .default
+# May 15, 2013: - changed default profile plot to show 2-beam solutions
+# - BUG: out_TLhist entry was still there
+# May 16, 2013: - -a => -d
+# Jun 5, 2013: - renamed $discard_data_from_beam to $bad_beam
+# Jun 5, 2013: - made ProcessingParams (without .profiles) default file
+# Sep 5, 2013: - also allow ProcessingParams.default
+# - added LWplot_spec to default output
# Variable Names:
# - variables that are only used in a particular library are
@@ -40,22 +50,22 @@
$processing_param_file = "ProcessingParams.$RUN";
} elsif (-r "ProcessingParams.default") {
$processing_param_file = "ProcessingParams.default";
+} elsif (-r "ProcessingParams") {
+ $processing_param_file = "ProcessingParams";
} else {
- croak("$0: cannot load either <ProcessingParams.$RUN> or <ProcessingParams.default>\n");
+ croak("$0: cannot find either <ProcessingParams.$RUN> or <ProcessingParams[.default]>\n");
}
-
# CTD depth adjustment
-# - set with -a
+# - set with -d (-a up to 2013/05/16)
# - value is added to CTD pressure
# - use when CTD has -ve pressures
-$CTD_neg_press_offset = &antsFloatOpt($opt_a,0);
-
+&antsFloatOpt(\$opt_d,0);
# suppress 3-beam LADCP solutions
-$RDI_Coords::minValidVels = 4 if ($opt_4);
+#$opt_4 = 1;
# correct attiude sensors
@@ -68,10 +78,6 @@
# - defaults to 2-last
$opt_b = '2,*' unless defined($opt_b);
-($LADCP_firstBin,$LADCP_lastBin) = split(',',$opt_b);
-croak("$0: cannot decode -b $opt_b\n")
- unless (numberp($LADCP_firstBin) &&
- ($LADCP_lastBin eq '*' || numberp($LADCP_lastBin)));
#======================================================================
# Logging and Output
@@ -79,22 +85,22 @@
# - there are 4 verbosity levels, selected by -v
# 0: only print errors
-# 1: default, UNIX-like (warnings and info messages that are not produced for every cast)
-# 2: progress messages and useful information
+# 1: UNIX-like (warnings and info messages that are not produced for every cast)
+# 2: (default) progress messages and useful information
# >2: debug messges
# - the most useful ones of these are 1 & 2
-$verbosity_level = &antsCardOpt($opt_v,2);
+&antsCardOpt(\$opt_v,2);
# output bin size in meters
-$output_bin_size = &antsFloatOpt($opt_o,10);
+&antsFloatOpt(\$opt_o,10);
# min w samples required for each vertical-velocity bin
-$min_w_nsamp = &antsCardOpt($opt_k,20);
+&antsCardOpt(\$opt_k,20);
# output base name
@@ -112,18 +118,19 @@
# _w.eps vertical velocities
# _residuals.eps residual vertical velocities
# _Sv.eps volume scattering coefficient after Deimes (1999)
-# _corr.eps correlation
+# _corr.eps correlation [DISABLED 2013/05/16]
$out_w = "| LWplot_residuals $plot_subdir/${out_basename}_residuals.eps" .
"| LWplot_Sv $plot_subdir/${out_basename}_Sv.eps" .
- "| LWplot_corr $plot_subdir/${out_basename}_corr.eps" .
+# "| LWplot_corr $plot_subdir/${out_basename}_corr.eps" .
"| LWplot_w $plot_subdir/${out_basename}_w.eps" .
"> $data_subdir/$out_basename.w";
# w profile output
-$out_profile = "| LWplot_prof $plot_subdir/${out_basename}_prof.eps" .
+$out_profile = "| LWplot_prof_2beam $plot_subdir/${out_basename}_prof.eps" .
+ "| LWplot_spec $plot_subdir/${out_basename}_spec.eps" .
"> $data_subdir/$out_basename.prof";
# log output
@@ -131,18 +138,21 @@
$out_log = "$log_subdir/$out_basename.log";
-# time-series output
+# time-series output (CTD acceleration effect)
-$out_timeseries = "$data_subdir/$out_basename.tis";
+$out_timeseries = "| LWplot_CAE $plot_subdir/${out_basename}_CAE.eps" .
+ "> $data_subdir/$out_basename.tis";
-# diagnostic plots
+# per-bin residual output (plot only)
+
+$out_BR = "| LWplot_BR $plot_subdir/${out_basename}_BR.eps";
+
-$out_BR = "| LWplot_BR $plot_subdir/${out_basename}_BR.eps";
-$out_TL = "| LWplot_TL $plot_subdir/${out_basename}_TL.eps" .
+# time-lagging output
+
+$out_TL = "| LWplot_TL $plot_subdir/${out_basename}_TL.eps" .
"> $data_subdir/$out_basename.TL";
-$out_TLhist = "| LWplot_TLhist $plot_subdir/${out_basename}_TLhist.eps";
-
#======================================================================
# Data Editing
@@ -150,17 +160,17 @@
# min correlation
-$min_correlation = &antsFloatOpt($opt_c,70);
+&antsFloatOpt(\$opt_c,70);
# max tilt (pitch/roll)
-$max_tilt = &antsFloatOpt($opt_t,15);
+&antsFloatOpt(\$opt_t,15);
# max err vel
-$max_allowed_errvel = &antsFloatOpt($opt_e,0.1);
+&antsFloatOpt(\$opt_e,0.1);
# truncate farthest valid velocities
@@ -170,17 +180,17 @@
# discard velocities from chosen beam (1-4)
-$discard_velocities_from_beam = 0;
+$bad_beam = 0;
# max LADCP gap length in seconds
-$max_LADCP_reflr_vel_gap = &antsFloatOpt($opt_g,60);
+&antsFloatOpt(\$opt_g,60);
# max allowed vertical velocity in m/s
-$max_allowed_w = &antsFloatOpt($opt_m,1);
+$w_max_lim = 1;
# in each ensemble, vertical velocities differing more than this
@@ -209,7 +219,7 @@
# externally supplied lag
-$first_guess_timelag = $opt_i;
+# $opt_i = 567;
# reference layer bins for w for time matching
@@ -220,18 +230,12 @@
# number of time lags during each of 2 lagging steps
$opt_n = '10,100' unless defined($opt_n);
-@number_of_timelag_windows = split(',',$opt_n);
-croak("$0: cannot decode -n $opt_n\n")
- unless numberp($number_of_timelag_windows[0]) && numberp($number_of_timelag_windows[1]);
# time lag search window widths for each of 2 lagging steps
# - full width in seconds
$opt_w = '240,20' unless defined($opt_w);
-@length_of_timelag_windows = split(',',$opt_w);
-croak("$0: cannot decode -w $opt_w\n")
- unless numberp($length_of_timelag_windows[0]) && numberp($length_of_timelag_windows[1]);
# if top 3 lags have spread greater than $TL_max_allowed_three_lag_spread
@@ -243,7 +247,7 @@
# - the optimum value of $TL_max_allowed_three_lag_spread may be cast-duration dependent
$TL_max_allowed_three_lag_spread = 3;
-$TL_required_top_three_fraction = &antsFloatOpt($opt_3,0.6);
+&antsFloatOpt(\$opt_3,0.6);
#======================================================================