diff -r c39e37d59638 -r 5e67754f6457 checkfiles2 --- a/checkfiles2 Thu Nov 21 14:01:21 2013 +0000 +++ b/checkfiles2 Fri Jul 03 10:25:08 2020 -0400 @@ -2,9 +2,9 @@ #====================================================================== # C H E C K F I L E S 2 # doc: Wed Mar 10 22:23:52 2004 -# dlm: Thu Aug 26 00:26:06 2010 +# dlm: Fri Jul 3 10:14:00 2020 # (c) 2004 A.M. Thurnherr -# uE-Info: 27 39 NIL 0 0 72 2 2 8 NIL ofnI +# uE-Info: 90 18 NIL 0 0 72 2 2 8 NIL ofnI #====================================================================== # HISTORY: @@ -17,6 +17,7 @@ # Nov 19, 2008: - added version # Aug 25, 2010: - DEFAULTS.expect -> CRUISE_SETUP.expect # - libBB.expect -> libRDI.expect +# Jul 3, 2020: - expunged master/slave terminology #---------------------------------------------------------------------- # Setup @@ -45,27 +46,27 @@ reset_two_instruments; send_user "\nGetting station number..."; -select_master 0; -set master_deployment_name [get_deployment_name]; -if {[scan $master_deployment_name $master_deployment_name_fmt master_stn] != 1} { - send_error "$master_deployment_name $master_deployment_name_fmt"; - error "Can't get station number of master"; +select_DL 0; +set DL_deployment_name [get_deployment_name]; +if {[scan $DL_deployment_name $DL_deployment_name_fmt DL_stn] != 1} { + send_error "$DL_deployment_name $DL_deployment_name_fmt"; + error "Can't get station number of DL"; } -select_slave; set slave_deployment_name [get_deployment_name]; -set slave_deployment_name [get_deployment_name]; -if {[scan $slave_deployment_name $slave_deployment_name_fmt slave_stn] != 1} { - error "Can't get station number of slave"; +select_UL; set UL_deployment_name [get_deployment_name]; +set UL_deployment_name [get_deployment_name]; +if {[scan $UL_deployment_name $UL_deployment_name_fmt UL_stn] != 1} { + error "Can't get station number of UL"; } -if {$master_stn != $slave_stn} { - select_master; put_to_sleep; select_slave; put_to_sleep; - error "Master/slave stations disagree"; +if {$DL_stn != $UL_stn} { + select_DL; put_to_sleep; select_UL; put_to_sleep; + error "DL/UL stations disagree"; } -set stn [format $stn_format $master_stn]; +set stn [format $stn_format $DL_stn]; send_user "\[$stn\]"; set cast_dir [format %s/%s $raw_dir $stn]; if {![file isdirectory $cast_dir]} { - select_master; put_to_sleep; select_slave; put_to_sleep; + select_DL; put_to_sleep; select_UL; put_to_sleep; error "cast directory $cast_dir does not exist!"; } @@ -80,13 +81,13 @@ start_logging [format %s_%s.log $tmp $stn]; send_user "\nChecking data files...\n"; -set_color 0; check_data [format %s000.000 [format $master_deployment_name_fmt $master_stn]]; -set_color 1; check_data [format %s000.000 [format $slave_deployment_name_fmt $slave_stn]]; +set_color 0; check_data [format %s000.000 [format $DL_deployment_name_fmt $DL_stn]]; +set_color 1; check_data [format %s000.000 [format $UL_deployment_name_fmt $UL_stn]]; set_color; send_user "Backing up data files..."; -backup_master_data $master_stn; -backup_slave_data $slave_stn; +backup_DL_data $DL_stn; +backup_UL_data $UL_stn; send_user "\nDone\n"