ladcp2
author A.M. Thurnherr <athurnherr@yahoo.com>
Fri, 03 Jul 2020 10:25:08 -0400
changeset 12 5e67754f6457
parent 5 f41d45fe7ae9
permissions -rwxr-xr-x
V1.6: no more master/slave terminology
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
     1
#!/usr/bin/expect -f
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
     2
#======================================================================
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
     3
#                    L A D C P 2 
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
     4
#                    doc: Wed Mar 10 22:23:52 2004
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
     5
#                    dlm: Fri Jul  3 10:16:46 2020
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
     6
#                    (c) 2004 A.M. Thurnherr
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
     7
#                    uE-Info: 137 66 NIL 0 0 72 2 2 8 NIL ofnI
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
     8
#======================================================================
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
     9
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    10
# HISTORY:
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    11
#  Mar 10, 2004: - created
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    12
#  Mar 12, 2004: - released
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    13
#  Mar 21, 2004: - added automatic station numbering
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    14
#		 - unified prompts
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    15
#  Mar 24, 2004: - doubled station-number-entry timeout
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    16
#  Jun 18, 2004: - BUG: station 008 bombed on octal digit
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    17
#  Feb 14, 2006: - BUG: log files were written to bin dir
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    18
#  Oct  4, 2006: - adapted to older version of expect
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    19
#  Oct 31, 2007: - BUG: wrong default on non-empty memory
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    20
#  Nov 19, 2008: - adapted to new firmware behavior (load_factory_defaults)
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    21
#  Nov 19, 2008: - added version
4
fda11de1826e version left on Poseidon at end of P403
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 0
diff changeset
    22
#  Aug 25, 2010: - DEFAULTS.expect -> CRUISE_SETUP.expect
fda11de1826e version left on Poseidon at end of P403
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 0
diff changeset
    23
#		 - libBB.expect -> libRDI.expect
5
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    24
#  Dec 10, 2010: - allow restarting a cast with same number
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
    25
#  Jul  3, 2020: - expunged master/slave terminology
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    26
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    27
#----------------------------------------------------------------------
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    28
# Setup
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    29
#----------------------------------------------------------------------
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    30
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    31
log_user 0;
4
fda11de1826e version left on Poseidon at end of P403
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 0
diff changeset
    32
source CRUISE_SETUP.expect;
fda11de1826e version left on Poseidon at end of P403
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 0
diff changeset
    33
regsub {dir1} [exec which dir1] {libRDI.expect} path;
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    34
source $path;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    35
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    36
print_version;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    37
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    38
if {$argc == 0} {
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    39
	set ask 1;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    40
	if {[file isfile .last_stn]} {
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    41
		set stn [expr [exec cat .last_stn] + 1];
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    42
		set stnstr [format $stn_format $stn];
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    43
		if {[affirm "Use station number $stnstr? (y/N) " 10]} {
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    44
			set ask 0;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    45
		}
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    46
	}
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    47
	if {$ask == 1} {
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    48
		set stn [input_int "Station number = "];
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    49
		set stnstr [format $stn_format $stn];
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    50
	}
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    51
} else {
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    52
	set stn [lindex $argv 0];
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    53
	set stnstr [format $stn_format $stn];
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    54
}
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    55
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    56
if ![file isdirectory $raw_dir] {
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    57
	error "directory $raw_dir does not exist";
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    58
}
5
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    59
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    60
set cast_dir [format %s/%s $raw_dir $stnstr];
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    61
if [file isdirectory $cast_dir] {
5
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    62
	if {![affirm "WARNING: data directory $cast_dir exists --- are you sure station number $stnstr is ok? (y/N) " 10]} {
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    63
		send_error "$argv0 aborted\n";
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    64
		exit 0;
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    65
	}
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    66
	set attempt 1;					# rename
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    67
	while {[file isdirectory $cast_dir.aborted$attempt]} {
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    68
		set attempt [expr $attempt + 1];
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    69
	}
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    70
	exec mv $cast_dir $cast_dir.aborted$attempt;
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    71
	send_user "data directory $cast_dir renamed to $cast_dir.aborted$attempt\n"
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    72
}
5
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    73
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    74
set prev_cast_dir [format %s/$stn_format $raw_dir [expr $stn - 1]];
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    75
if {![file isdirectory $prev_cast_dir]} {
5
f41d45fe7ae9 V1.5 initial release
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents: 4
diff changeset
    76
	if {![affirm "WARNING: previous-station data directory $prev_cast_dir does not exist --- are you sure station number $stnstr is ok? (y/N) " 10]} {
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    77
		send_error "$argv0 aborted\n";
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    78
		exit 0;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    79
	}
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    80
}
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    81
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    82
#----------------------------------------------------------------------
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    83
# Deploy LADCP
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    84
#----------------------------------------------------------------------
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    85
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    86
set_color;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    87
send_user "Connecting to instruments...";
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    88
spawn bbabble -ms $tty0 $tty1;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    89
wait_for_startup;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    90
reset_two_instruments;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    91
if {![memory_empty]} {
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    92
	if {![affirm "\nWARNING: Memory is not empty; continue anyway? (y/N) " 10]} {
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    93
		send_user "Putting instruments to sleep...";
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
    94
		select_DL 0; put_to_sleep;
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
    95
		select_UL; put_to_sleep;
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    96
		send_user "\nDone\n";
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    97
		exit;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    98
	}
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
    99
} else {
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   100
	send_user "\n";
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   101
}
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   102
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   103
exec mkdir $cast_dir;
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   104
exec cp $DL_cmd_file $cast_dir;
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   105
exec cp $UL_cmd_file $cast_dir;
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   106
exec echo $stn > .last_stn;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   107
cd $cast_dir;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   108
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   109
if {![file isfile $DL_cmd_file]} {
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   110
	error "Failed to copy $DL_cmd_file to [pwd]";
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   111
}
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   112
if {![file isfile $UL_cmd_file]} {
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   113
	error "Failed to copy $UL_cmd_file to [pwd]";
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   114
}
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   115
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   116
regsub {.*/} $argv0 {} basename;
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   117
start_logging [format %s_%s.log $basename $stnstr];
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   118
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   119
send_user "Resetting instruments to factory defaults...";
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   120
select_DL 0; load_factory_defaults;
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   121
select_UL; load_factory_defaults;
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   122
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   123
send_user "\nSetting instrument clocks...";
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   124
set_computer_time;
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   125
select_DL 0; set_instrument_clock;
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   126
select_UL; set_instrument_clock;
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   127
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   128
send_user "\nSetting deployment names...";
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   129
select_DL; set_deployment_name [format $DL_deployment_name_fmt $stn];
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   130
select_UL; set_deployment_name [format $UL_deployment_name_fmt $stn];
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   131
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   132
send_user "\nUploading command files";
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   133
select_UL 0;
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   134
upload_file $UL_cmd_file [format %s_log $UL_cmd_file] "[format $UL_deployment_name_fmt $stn].hwconfig";
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   135
resume_logging [format %s_%s.log $basename $stnstr];
12
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   136
select_DL;
5e67754f6457 V1.6: no more master/slave terminology
A.M. Thurnherr <athurnherr@yahoo.com>
parents: 5
diff changeset
   137
upload_file $DL_cmd_file [format %s_log $DL_cmd_file] "[format $DL_deployment_name_fmt $stn].hwconfig";
0
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   138
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   139
send_user "\nDone\n";
648bde652211 created from V1.4beta
A.M. Thurnherr <ant@ldeo.columbia.edu>
parents:
diff changeset
   140