Changeset 28794 for branches/eam_branches/ipp-20100621/pstamp/scripts/pstampparse.pl

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20100621/pstamp

Files:

• . (modified) (1 prop)
• scripts/pstampparse.pl (modified) (3 diffs)

branches/eam_branches/ipp-20100621/pstamp

@@ -16 +16 @@
 ltmain.sh
 libtool
+ppstamp.pc

@@ -16 +16 @@
 ltmain.sh
 libtool
+ppstamp.pc

branches/eam_branches/ipp-20100621/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;
@@ -812 +814 @@
         ($stage ne 'chip' and $state eq 'full')) {
         my_die("$stage $stage_id is in unexpected state $state", $PS_EXIT_PROG_ERROR);
+    }
+
+    if (($stage eq 'diff') and ($stage_id <= 22778)) {
+        print STDERR "diff_id $stage_id cannot be updated\n";
+        $$r_dep_id = 0;
+        $$r_fault = $PSTAMP_GONE;
+        $$r_jobState = 'stop';
+        return;
     }
 
@@ -877 +887 @@
             $$r_newState = 'stop';
             $$r_fault = $PSTAMP_GONE;
-        } elsif (($data_state ne 'full') or ($need_magic and ($image->{magicked} < 0))) {
+        } elsif (($data_state ne 'full') or ($need_magic and ($image->{magicked} < 0)) or ($run_state eq 'goto_cleaned')) {
    
             if ($stage eq 'stack') {

@@ -16 +16 @@
 ltmain.sh
 libtool
+ppstamp.pc