Changeset 12020

Timestamp:

Feb 23, 2007, 3:02:44 PM (19 years ago)

Author:

Paul Price

Message:

Fixing names following renaming

Location:

trunk/ippScripts/scripts

Files:

• ipp_serial_camera.pl (modified) (2 diffs)
• ipp_serial_chip.pl (modified) (2 diffs)
• ipp_serial_register.pl (modified) (3 diffs)

trunk/ippScripts/scripts/ipp_serial_camera.pl

@@ -33 +33 @@
 # Look for programs we need
 my $missing_tools;
-my $camtool = can_run('p3tool') or (warn "Can't find p3tool" and $missing_tools = 1);
-my $phase3 = can_run('phase3.pl') or (warn "Can't find phase3.pl" and $missing_tools = 1);
+my $camtool = can_run('camtool') or (warn "Can't find camtool" and $missing_tools = 1);
+my $camera = can_run('camera_exp.pl') or (warn "Can't find camera_exp.pl" and $missing_tools = 1);
 die "Can't find required tools.\n" if $missing_tools;
 
@@ -52 +52 @@
     my $camera = $item->{camera};
     
-    my $command = "$phase3 --exp_tag $exp_tag --camera $camera --dbname $dbname";
+    my $command = "$camera --exp_tag $exp_tag --camera $camera --dbname $dbname";
     $command .= " --no-op" if defined $no_op;
     $command .= " --no-update" if defined $no_update;

trunk/ippScripts/scripts/ipp_serial_chip.pl

@@ -33 +33 @@
 # Look for programs we need
 my $missing_tools;
-my $chiptool = can_run('p2tool') or (warn "Can't find p2tool" and $missing_tools = 1);
-my $phase2 = can_run('phase2.pl') or (warn "Can't find phase2.pl" and $missing_tools = 1);
+my $chiptool = can_run('chiptool') or (warn "Can't find chiptool" and $missing_tools = 1);
+my $chip = can_run('chip_imfile.pl') or (warn "Can't find chip_imfile.pl" and $missing_tools = 1);
 die "Can't find required tools.\n" if $missing_tools;
 
@@ -54 +54 @@
     my $uri = $item->{uri};
     
-    my $command = "$phase2 --exp_tag $exp_tag --class_id $class_id --uri $uri --dbname $dbname --camera $camera";
+    my $command = "$chip --exp_tag $exp_tag --class_id $class_id --uri $uri --dbname $dbname --camera $camera";
     $command .= " --no-op" if defined $no_op;
     $command .= " --no-update" if defined $no_update;

trunk/ippScripts/scripts/ipp_serial_register.pl

@@ -29 +29 @@
 # Look for programs we need
 my $missing_tools;
-my $regtool = can_run('p0tool') or (warn "Can't find p0tool" and $missing_tools = 1);
-my $phase0_imfile = can_run('phase0_imfile.pl') or (warn "Can't find phase0_imfile.pl" and $missing_tools = 1);
-my $phase0_exp = can_run('phase0_exp.pl') or (warn "Can't find phase0_exp.pl" and $missing_tools = 1);
+my $regtool = can_run('regtool') or (warn "Can't find regtool" and $missing_tools = 1);
+my $register_imfile = can_run('register_imfile.pl') or (warn "Can't find register_imfile.pl" and $missing_tools = 1);
+my $register_exp = can_run('register_exp.pl') or (warn "Can't find register_exp.pl" and $missing_tools = 1);
 die "Can't find required tools.\n" if $missing_tools;
 
@@ -51 +51 @@
     my $uri = $item->{uri};
     
-    my $command = "$phase0_imfile --exp_tag $exp_tag --class $class --class_id $class_id --uri $uri --dbname $dbname";
+    my $command = "$register_imfile --exp_tag $exp_tag --class $class --class_id $class_id --uri $uri --dbname $dbname";
     $command .= " --workdir $workdir" if defined $workdir;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -71 +71 @@
     my $exp_tag = $item->{exp_tag};
     
-    my $command = "$phase0_exp --exp_tag $exp_tag --dbname $dbname";
+    my $command = "$register_exp --exp_tag $exp_tag --dbname $dbname";
     $command .= " --workdir $workdir" if defined $workdir;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =