Changeset 28980 for branches/eam_branches/ipp-20100621/pstamp/scripts/pstamp_job_run.pl

Timestamp:

Aug 19, 2010, 6:50:13 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/pstamp/scripts/pstamp_job_run.pl (modified) (4 diffs)

branches/eam_branches/ipp-20100621/pstamp/scripts/pstamp_job_run.pl

@@ -93 +93 @@
 
     $argString .= " -file $params->{image}";
-    $argString .= " -mask $params->{mask}";
-    my @file_list = ($params->{image}, $params->{mask});
+    my @file_list = ($params->{image});
+    
+    my $nan_masked = 1;
+    if (!$params->{magicked}) {
+        $nan_masked = 0;
+    }
+    if ($nan_masked or ($options & $PSTAMP_SELECT_MASK)) {
+        $argString .= " -mask $params->{mask}";
+        push @file_list, $params->{mask};
+    }
     if ($options & $PSTAMP_SELECT_VARIANCE) {
         $argString .= " -variance $params->{weight}";
@@ -351 +359 @@
     foreach my $f (@_) {
         if (!$ipprc->file_exists($f)) {
-            my_die( "file $f does not exist:", $job_id, $PS_EXIT_SYS_ERROR);
+            my_die( "file $f does not exist:", $job_id, $PSTAMP_GONE, 'stop');
         }
     }
@@ -361 +369 @@
     my $job_id = shift;         # job identifier
     my $exit_code = shift;      # Exit code to add
+    my $job_state = shift;      # new pstampJob.state
 
     $exit_code = $PS_EXIT_PROG_ERROR unless $exit_code;
+    $job_state = 'run' unless $job_state;
 
     carp($msg);
@@ -370 +380 @@
         $command .= " -set_fault $exit_code";
         # XXX: fix pstamptool to not require -state when -fault with nonzero value is provided
-        $command .= " -set_state run";
+        $command .= " -set_state $job_state";
         $command .= " -dbname $dbname" if defined $dbname;
         $command .= " -dbserver $dbserver" if defined $dbserver;