Changeset 12021 for trunk/ippScripts/scripts/diff_skycell.pl

Timestamp:

Feb 23, 2007, 3:12:46 PM (19 years ago)

Author:

Paul Price

Message:

More fixes following the name change.

File:

• trunk/ippScripts/scripts/diff_skycell.pl (modified) (13 diffs)

trunk/ippScripts/scripts/diff_skycell.pl

@@ -33 +33 @@
 use Pod::Usage qw( pod2usage );
 
-my ($p5_id, $camera, $dbname, $workdir, $no_update, $no_op);
+my ($diff_id, $camera, $dbname, $workdir, $no_update, $no_op);
 GetOptions(
-    'p5_id|d=s'         => \$p5_id, # Phase 5 identifier
+    'diff_id|d=s'       => \$diff_id, # Diff identifier
     'camera|c=s'        => \$camera, # Camera name
     'dbname|d=s'        => \$dbname, # Database name
@@ -45 +45 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --p5_id --camera",
+    -msg => "Required options: --diff_id --camera",
     -exitval => 3,
-) unless defined $p5_id
+) unless defined $diff_id
     and defined $camera;
 
@@ -54 +54 @@
 # Look for programs we need
 my $missing_tools;
-my $difftool = can_run('p5tool') or (warn "Can't find p5tool" and $missing_tools = 1);
+my $difftool = can_run('difftool') or (warn "Can't find difftool" and $missing_tools = 1);
 my $pois = can_run('pois') or (warn "Can't find pois" and $missing_tools = 1);
 if ($missing_tools) { 
@@ -65 +65 @@
 my $files;
 {
-    my $command = "$difftool -inputscfile -p5_id $p5_id";
+    my $command = "$difftool -inputscfile -diff_id $diff_id";
     $command .= " -dbname $dbname" if defined $dbname;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -71 +71 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform difftool -inputscfile: $error_code", $p5_id, $error_code);
+        &my_die("Unable to perform difftool -inputscfile: $error_code", $diff_id, $error_code);
     }
 
     my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
-        &my_die("Unable to parse metadata config doc", $p5_id, $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to parse metadata config doc", $diff_id, $PS_EXIT_PROG_ERROR);
     $files = parse_md_list($metadata) or 
-        &my_die("Unable to parse metadata list", $p5_id, $PS_EXIT_PROG_ERROR);
-}
-
-&my_die("Subtraction list contains more than two elements", $p5_id, $PS_EXIT_SYS_ERROR) unless
+        &my_die("Unable to parse metadata list", $diff_id, $PS_EXIT_PROG_ERROR);
+}
+
+&my_die("Subtraction list contains more than two elements", $diff_id, $PS_EXIT_SYS_ERROR) unless
     scalar @$files == 2;
 
@@ -95 +95 @@
     }
     if (defined $skycell_id) {
-        &my_die("Skycell identifiers don't match", $p5_id, $PS_EXIT_SYS_ERROR) unless
+        &my_die("Skycell identifiers don't match", $diff_id, $PS_EXIT_SYS_ERROR) unless
             $file->{skycell_id} eq $skycell_id;
     } else {
@@ -102 +102 @@
 }
 
-&my_die("Unable to identify template", $p5_id, $PS_EXIT_SYS_ERROR) unless defined $template;
-&my_die("Unable to identify input", $p5_id, $PS_EXIT_SYS_ERROR) unless defined $input;
+&my_die("Unable to identify template", $diff_id, $PS_EXIT_SYS_ERROR) unless defined $template;
+&my_die("Unable to identify input", $diff_id, $PS_EXIT_SYS_ERROR) unless defined $input;
 
 ### Working directory
@@ -114 +114 @@
 
 # Get the output filenames
-my $outputFile = "$skycell_id.sub.$p5_id"; # Root name
+my $outputFile = "$skycell_id.sub.$diff_id"; # Root name
 my $outputRoot = File::Spec->catfile( $workdir, $outputFile );
 
@@ -131 +131 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform ppImage: $error_code", $p5_id, $error_code);
-    }
-    &my_die("Couldn't find expected output file: $outputName", $p5_id, $PS_EXIT_SYS_ERROR) unless -f $outputName;
-#    &my_die("Couldn't find expected output file: $bin1Name",    $p5_id, $PS_EXIT_SYS_ERROR) unless -f $bin1Name;
-#    &my_die("Couldn't find expected output file: $bin2Name",    $p5_id, $PS_EXIT_SYS_ERROR) unless -f $bin2Name;
-#    &my_die("Couldn't find expected output file: $outputStats", $p5_id, $PS_EXIT_SYS_ERROR) unless -f $outputStats;
+        &my_die("Unable to perform ppImage: $error_code", $diff_id, $error_code);
+    }
+    &my_die("Couldn't find expected output file: $outputName", $diff_id, $PS_EXIT_SYS_ERROR) unless -f $outputName;
+#    &my_die("Couldn't find expected output file: $bin1Name",    $diff_id, $PS_EXIT_SYS_ERROR) unless -f $bin1Name;
+#    &my_die("Couldn't find expected output file: $bin2Name",    $diff_id, $PS_EXIT_SYS_ERROR) unless -f $bin2Name;
+#    &my_die("Couldn't find expected output file: $outputStats", $diff_id, $PS_EXIT_SYS_ERROR) unless -f $outputStats;
 
     # Get the statistics on the residual image
     if (0) { ### Disabled because pois doesn't output stats yet
         my $statsFile;          # File handle
-        open $statsFile, $outputStats or &my_die("Can't open statistics file $outputStats: $!", $p5_id, $PS_EXIT_SYS_ERROR);
+        open $statsFile, $outputStats or &my_die("Can't open statistics file $outputStats: $!", $diff_id, $PS_EXIT_SYS_ERROR);
         my @contents = <$statsFile>; # Contents of file
         close $statsFile;
         my $metadata = $mdcParser->parse(join "", @contents) or
-            &my_die("Unable to parse metadata config doc", $p5_id, $PS_EXIT_PROG_ERROR);
-        $stats->parse($metadata) or &my_die("Unable to find all values in statistics output.", $p5_id, $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to parse metadata config doc", $diff_id, $PS_EXIT_PROG_ERROR);
+        $stats->parse($metadata) or &my_die("Unable to find all values in statistics output.", $diff_id, $PS_EXIT_PROG_ERROR);
     }
 }
@@ -160 +160 @@
     # Add the subtraction result
     {
-        my $command = "$difftool -adddiffscfile -p5_id $p5_id -uri $outputName -b1_uri $outputRoot";
+        my $command = "$difftool -adddiffscfile -diff_id $diff_id -uri $outputName -b1_uri $outputRoot";
         $command .= " -bg $bg -bg_stdev $bg_stdev";
         $command .= " -dbname $dbname" if defined $dbname;
@@ -168 +168 @@
         unless ($success) {
             $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform difftool -adddiffscfile: $error_code", $p5_id, $error_code);
+            &my_die("Unable to perform difftool -adddiffscfile: $error_code", $diff_id, $error_code);
         }
         
@@ -176 +176 @@
     # Register the run as completed
     {
-        my $command = "$difftool -updaterun -p5_id $p5_id -state stop"; # Command to run p5tool
+        my $command = "$difftool -updaterun -diff_id $diff_id -state stop"; # Command to run difftool
         $command .= " -dbname $dbname" if defined $dbname;
 
@@ -193 +193 @@
 {
     my $msg = shift;            # Warning message on die
-    my $p5_id = shift;          # Phase 5 identifier
+    my $diff_id = shift;        # Diff identifier
     my $exit_code = shift;      # Exit code to add
 
     warn($msg);
-    if ($p5_id and not $no_update) {
-        my $command = "$difftool -updaterun -p5_id $p5_id -state stop -code $exit_code";
+    if ($diff_id and not $no_update) {
+        my $command = "$difftool -updaterun -diff_id $diff_id -state stop -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;
         system ($command);