Changeset 28628

Timestamp:

Jul 7, 2010, 4:22:55 PM (16 years ago)

Author:

bills

Message:

check for existence of files before invoking ppstamp. Get astromety file from params
istead of args

Location:

trunk/pstamp/scripts

Files:

• pstamp_checkdependent.pl (modified) (2 diffs)
• pstamp_job_run.pl (modified) (2 diffs)
• pstampparse.pl (modified) (1 diff)

trunk/pstamp/scripts/pstamp_checkdependent.pl

@@ -277 +277 @@
     # if chipProcessedImfile.state is cleaned call check_states_chip
 
-    # need to code warptool -setskyfiletoupdate
     my $metadata = shift;
     my $whole_run = shift;  # if true queue entire run for update
@@ -287 +286 @@
     my $warp_id = $metadata->{warp_id};
     my $state = $metadata->{state};
-    if ($state =~ /error/) {
+    if (($state =~ /error/) or ($state =~ /purged/) or ($state =~ /scrubbed/) or ($state eq 'drop')) {
         print STDERR "warpRun $warp_id has state $state faulting jobs\n";
         faultJobs('stop', undef, undef, $PSTAMP_GONE);

trunk/pstamp/scripts/pstamp_job_run.pl

@@ -92 +92 @@
     my_die("argument list is empty", $job_id, $PS_EXIT_DATA_ERROR) if !$argString;
 
-    # XXX: remove -astrom from argString and add it here
-
     $argString .= " -file $params->{image}";
     $argString .= " -mask $params->{mask}";
+    my @file_list = ($params->{image}, $params->{mask});
     if ($options & $PSTAMP_SELECT_VARIANCE) {
         $argString .= " -variance $params->{weight}";
-    }
+        push @file_list, $params->{weight};
+    }
+
+    if ($params->{astrom}) {
+        $argString .= " -astrom $params->{astrom}";
+        push @file_list, $params->{astrom};
+    }
+
+    check_files(@file_list);
 
     my $command = "$ppstamp $outputBase $argString";
@@ -341 +348 @@
 }
 
+sub check_files {
+    foreach my $f (@_) {
+        if (!$ipprc->file_exists($f)) {
+            my_die( "file $f does not exist:", $job_id, $PS_EXIT_SYS_ERROR);
+        }
+    }
+}
+
 sub my_die
 {

trunk/pstamp/scripts/pstampparse.pl

@@ -500 +500 @@
     }
 
+if (0) {
     # add astrometry file for raw and chip images if one is available
     if (($stage eq "chip") || ($stage eq "raw")) {
         $args .= " -astrom $image->{astrom}" if $image->{astrom};
     }
+}
 
     $image->{job_args} = $args;