Changeset 28980 for branches/eam_branches/ipp-20100621/pstamp

Timestamp:

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

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20100621/pstamp

Files:

• scripts/detect_query_create (modified) (6 diffs)
• scripts/detect_query_read (modified) (8 diffs)
• scripts/detectability_respond.pl (modified) (8 diffs)
• scripts/dqueryparse.pl (modified) (2 diffs)
• scripts/pstamp_checkdependent.pl (modified) (1 diff)
• scripts/pstamp_job_run.pl (modified) (4 diffs)
• scripts/pstampparse.pl (modified) (1 diff)
• src/ppstampMakeStamp.c (modified) (4 diffs)

branches/eam_branches/ipp-20100621/pstamp/scripts/detect_query_create

@@ -17 +17 @@
      $query_id, 
      $nostage,
+     $version,
      );
 
@@ -22 +23 @@
            'input|i=s'    => \$input,
            'output|o=s'   => \$output,
-           'query_id|q=s'  => \$query_id,
+           'query_id|q=s' => \$query_id,
+           'version|v=s'  => \$version,
            'nostage'      => \$nostage,
 ) or pod2usage( 2 );
@@ -30 +32 @@
            -exitval => 3) unless defined $input and defined $output;
 
-# The header kewords
+# Read what we've been given
+my $in;
+if ($input eq '-') {
+    $in = \*STDIN;
+} else {
+    open $in, "<$input" or die "cannot open $input for reading";
+}
+my %colData;
+my %headerData;
+my $numRows = read_data_for_table($in,'\s+', \%colData, \%headerData); 
+if (!$numRows) {
+    print STDERR "no data in $input\n";
+    exit 1;
+}
+
+# The header keywords
 my $header = [
         { name =>  'QUERY_ID', 
@@ -62 +79 @@
                     value => undef
         },
-       { name =>  'STAGE',
+        { name =>  'STAGE',
                    writetype => TSTRING,
                    comment => 'processing stage to examine',
                    value => undef
-       }
+        }
 ];
-unless(defined($nostage)) {
-    push @{ $header },        { name =>  'STAGE',
-                                writetype => TSTRING,
-                                comment => 'processing stage to examine',
-                                value => undef
-    };
+
+# Validate header.
+
+if (defined($query_id)) {
+    $headerData{QUERY_ID} = $query_id;
+}
+unless (exists($headerData{QUERY_ID})) {
+    die "No QUERY_ID specified for header.";
+}
+
+unless (exists($headerData{EXTVER})) {
+    die "No EXTVER specified for header.";
+}
+if ($headerData{EXTVER} == 1) {
+    unless (exists($headerData{STAGE})) {
+        warn "No STAGE value specified in header. Assuming default value of 'diff'";
+        $headerData{STAGE} = 'diff';
+    }
+    foreach my $entry_ref (@{ $header }) {
+        my $name = $entry_ref->{name};
+        unless (exists($headerData{$name})) {
+            die "Required header value $name not specified (try EXTVER=2?).";
+        }
+        $entry_ref->{value} = $headerData{$name};
+    }
+}    
+elsif ($headerData{EXTVER} == 2) {
+    unless (exists($headerData{STAGE})) {
+        warn "No STAGE value specified in header. Assuming default value of 'diff'";
+        $headerData{STAGE} = 'diff';
+    }
+    my $tmp_header;
+    foreach my $entry_ref (@{ $header }) {
+        my $name = $entry_ref->{name};
+        if (exists($headerData{$name})) {
+            $entry_ref->{value} = $headerData{$name};
+            push @{ $tmp_header }, $entry_ref;
+        }
+    }
+    $header = $tmp_header;
+}
+else {
+    die "Unknown EXTVER = $headerData{EXTVER}.";
 }
 
@@ -91 +145 @@
         { name => 'MAG',      type => 'D',   writetype => TDOUBLE },
 ];
-
-my $in;
-if ($input eq '-') {
-    $in = \*STDIN;
-} else {
-    open $in, "<$input" or die "cannot open $input for reading";
-}
-
-my @colData;
-foreach (@$columns) {
-    push @colData, [];
-}
-
-
-my $numRows = read_data_for_table($in,'\s+', \@colData, $header); 
-if (!$numRows) {
-    print STDERR "no data in $input\n";
-    exit 1;
-}
-
-# overwrite the QUERY_ID value from the input file with the command
-# line argument
-
-if ($query_id) {
-    $header->[0]->{value} = $query_id;
-}
-
-my $status = make_fits_table($output, EXTNAME, $numRows, \@colData, $columns, $header);
+my $columns_v2 = [
+    { name => 'FPA_ID', type => '20A', writetype => TSTRING },
+    { name => 'MJD-OBS', type => 'D', writetype => TDOUBLE },
+    { name => 'FILTER', type => '20A', writetype => TSTRING },
+    { name => 'OBSCODE', type => '20A', writetype => TSTRING },
+    { name => 'STAGE', type => '20A', writetype => TSTRING }
+    ];
+# Validate the data.
+if ($headerData{EXTVER} == 1) {
+    foreach my $entry_ref (@{ $columns }) {
+        my $name = $entry_ref->{name};
+        unless (exists($colData{$name})) {
+            die "Required data column $name not found (try EXTVER=2?).";
+        }
+    }
+}
+if ($headerData{EXTVER} == 2) {
+    my $tmp_columns;
+    foreach my $entry_ref (@{ $columns }) {
+        my $name = $entry_ref->{name};
+        if (exists($colData{$name})) {
+            push @{ $tmp_columns }, $entry_ref;
+        }
+    }
+    foreach my $entry_ref (@{ $columns_v2 }) {
+        my $name = $entry_ref->{name};
+        if (exists($colData{$name})) {
+            push @{ $tmp_columns }, $entry_ref;
+        }
+    }
+    $columns = $tmp_columns;
+}           
+
+# Construct the array of arrays
+my @colDataAoA = ();
+foreach my $col_def (@{ $columns }) {
+    my $name = $col_def->{name};
+    push @colDataAoA, $colData{$name};
+}
+
+# foreach (@$columns) {
+#     push @colData, [];
+# }
+
+
+
+my $status = make_fits_table($output, EXTNAME, $numRows, \@colDataAoA, $columns, $header);
 
 exit $status;
@@ -230 +303 @@
 
     my $line_num = 0;
-
-    # read data for header if any data is expected
-    if ($header) {
-        my $nhead = @$header;
-        while (my $line = <$in>) {
-            $line_num++;
-            chomp $line;
-            next if !$line;             # skip blank lines
-            next if ($line =~ /^#/);    # skip comment lines
-            my @vals = split /$sep/, $line;
-            my $nvals = @vals;
-            die "number of header columns in input $nvals does not equal expected number of header words $nhead"
-                    if (@vals != @$header);
-
-            for (my $i=0; $i < @$header; $i++) {
-                $header->[$i]->{value} = $vals[$i];
-            }
-
-            last; # only one header line
-        }
-    }
-
-    my $row_num = 0;
-    my $ncols = @$colData;
-    while (my $line = <$in>) {
-        chomp $line;
-        $line_num++;
-        next if !$line;             # skip blank lines
-        next if ($line =~ /^#/);    # skip comment lines
-
-        my @vals = split /$sep/, $line;
-        my $nvals = @vals;
-        die "number of columns $nvals in input does not equal expected number of header "
-                . " words $ncols on line $line_num" if ($nvals != $ncols);
-
-        for (my $col = 0; $col < @$colData; $col++) {
-            $colData->[$col]->[$row_num] = $vals[$col];
-        }
-        $row_num++;
-    }
-
+    my @keywords = ();
+    my $row_num;
+    while (<$in>) {
+        chomp;
+        if ($line_num == 0) {
+            # Parse header information keywords
+            $_ =~ s/#//g;
+            @keywords = split /\s+/;
+            if ($keywords[0] eq '') {
+                shift(@keywords);
+            }
+        }
+        elsif ($line_num == 1) {
+            # Parse header information values
+            my @values = split /\s+/;
+            if ($#values != $#keywords) {
+                die "Number of header columns in input does not equal expected number of header words";
+            }
+            for (my $i = 0; $i <= $#values; $i++) {
+                $header->{$keywords[$i]} = $values[$i];
+            }           
+        }
+        elsif ($line_num == 2) {
+            # Parse table information keywords, dumping old keywords
+            $_ =~ s/#//g;
+            @keywords = split /\s+/;
+            if ($keywords[0] eq '') {
+                shift(@keywords);
+            }
+        }
+        else {
+            # Parse table information values
+            unless ($_ =~ /^#/) {
+                my @values = split /\s+/;
+                if ($#values != $#keywords) {
+                    die "Number of header columns in input does not equal expected number of header words";
+                }
+                for (my $i = 0; $i <= $#values; $i++) {
+                    push @{ $colData{$keywords[$i]} }, $values[$i];
+                    $row_num = $#{ $colData{$keywords[$i] } } + 1;
+                }               
+            }
+        }
+        $line_num++;
+    }
     # we return the number of rows read
     return $row_num;

branches/eam_branches/ipp-20100621/pstamp/scripts/detect_query_read

@@ -20 +20 @@
 use Math::Trig;
 use Data::Dumper;
+use IPC::Cmd 0.36 qw( can_run run );
 
 use constant EXTNAME => 'MOPS_DETECTABILITY_QUERY'; # Extension name for table
@@ -31 +32 @@
      $output,                   # Name of output table
      $save_temps,               # Save temporary files?
+     $dbname,                   # needed to do camtool lookups.
      );
+
+my $regtool = can_run('regtool') or (die "Can't find regtool");
+my $camtool = can_run('camtool') or (die "Can't find regtool");
+
 
 GetOptions(
            'input|i=s'    => \$input,
            'output|o=s'   => \$output,
+           'dbname=s'     => \$dbname,
            'nolabel|l'    => \$no_print_label,
            'noheader|h'   => \$no_print_header,
@@ -65 +72 @@
 
 # The keywords found in the header
-# my $header = {
-#         'EXTVER'   => { name => 'EXTVER',
-#                      writetype => TSTRING,
-#                      comment => 'Extension version',
-#                      value => undef
-#                       },
-#         'EXTNAME'  => { name => 'EXTNAME',
-#                      writetype => TSTRING,
-#                      comment => 'name of this binary table extension',
-#                      value => undef
-#                     },
-#         'QUERY_ID' => { name => 'QUERY_ID', 
-#                         writetype => TSTRING, 
-#                         comment => 'MOPS Query ID for this batch query',
-#                         value => undef
-#                       },
-#         'FPA_ID'   => { name => 'FPA_ID', 
-#                         writetype => TSTRING, 
-#                         comment => 'orginal FPA_ID used at ingest',
-#                         value => undef
-#                       }, 
-#         'MJD_OBS'  => { name => 'MJD-OBS', 
-#                         writetype => TDOUBLE, 
-#                         comment => 'starting time of the exposure, MJD',
-#                         value => undef
-#                       },
-#         'FILTER'   => { name => 'FILTER', 
-#                         writetype => TSTRING, 
-#                         comment => 'effective filter use for the exposure',
-#                         value => undef
-#                       },
-#         'OBSCODE'  => { name => 'OBSCODE', 
-#                         writetype => TSTRING, 
-#                         comment => 'site identifier (MPC observatory code)',
-#                         value => undef
-#                       },
-#       'STAGE'    => { 
-#                       name => 'STAGE',
-#                       writetype => TSTRING,
-#                       comment => 'processing stage to examine',
-#                       value => undef
-#                     }
-# };
 
 my $parse_error = 0;
-# Parse the header to determine what we expect to find.
+# Parse the header to determine what we have to work with.
+# Clean up empty space and remove unneeded single quotes.
 foreach my $header_key (keys %{ $inHeader }) {
     $inHeader->{$header_key} =~ s/\s+//g;
     $inHeader->{$header_key} =~ s/\'//g;
 }
-my ($EXTVER,$headerEXTNAME,$QUERY_ID,$FPA_ID,$MJD_OBS,$FILTER,$OBSCODE,$STAGE) = 
-    ($inHeader->{EXTVER},$inHeader->{EXTNAME},$inHeader->{QUERY_ID},$inHeader->{FPA_ID},
-     $inHeader->{'MJD-OBS'},$inHeader->{FILTER},$inHeader->{OBSCODE},$inHeader->{STAGE});
+my ($EXTVER,$headerEXTNAME,$QUERY_ID,
+    $FPA_ID,$MJD_OBS,$FILTER,
+    $OBSCODE,$STAGE) = 
+    ($inHeader->{EXTVER},$inHeader->{EXTNAME},$inHeader->{QUERY_ID},
+     $inHeader->{FPA_ID},$inHeader->{'MJD-OBS'},$inHeader->{FILTER},
+     $inHeader->{OBSCODE},$inHeader->{STAGE});
+
 unless(defined($EXTVER) && defined($headerEXTNAME) &&
        (($EXTVER == 1)||($EXTVER == 2)) && 
-       ($headerEXTNAME eq EXTNAME)) {
+       ($headerEXTNAME eq EXTNAME)&&
+       (defined($QUERY_ID))) {
     $parse_error = 1;
 }
@@ -143 +113 @@
         # apparent magnitude
         { name => 'MAG',      type => 'D',   writetype => TDOUBLE, version => 1 },
-    # v2 query_id: MOPS query ID for this batch query
+    # v2 query_id: needs to be here.
     { name => 'QUERY_ID', type => '20A', writetype => TSTRING, version => 2, default => $QUERY_ID },
     # v2 fpa_id: original FPA_ID used at ingest
@@ -172 +142 @@
 
     if ($col->{version} > $EXTVER) {
-        @{ $colData{$col->{name}} } = map { $col->{default} } (0 .. $numRows);
+        @{ $colData{$col->{name}} } = map { $col->{default} } (0 .. $numRows - 1);
         next;
     }
-    $inFits->get_colnum(0, $col->{name}, $col_num, $status) and check_fitsio($status);
-    $inFits->get_coltype($col_num, $col_type, undef, undef, $status) and check_fitsio($status);
-    $inFits->read_col($col_type, $col_num, 1, 1, $numRows, 0, $col_data, undef, $status)
-                                                                    and check_fitsio($status);
-    $colData{$col->{name}} = $col_data;
-    if ($col->{name} eq 'MJD-OBS') {
-        print @{ $col_data } . "\n";
+    else {
+        if (defined($col->{default})) {
+            @{ $colData{$col->{name}} } = map { $col->{default} } (0 .. $numRows - 1);
+            next;
+        }        
+    }   
+
+    $inFits->get_colnum(0, $col->{name}, $col_num, $status);
+    if ($status == 0) {
+        $inFits->get_coltype($col_num, $col_type, undef, undef, $status) and check_fitsio($status);
+        $inFits->read_col($col_type, $col_num, 1, 1, $numRows, 0, $col_data, undef, $status)
+            and check_fitsio($status);
+        $colData{$col->{name}} = $col_data;
+        if ($col->{name} eq 'QUERY_ID') {
+            print @{ $col_data } . "\n";
+        }
+
+    }
+    elsif ($status == 219) {
+        @{ $colData{$col->{name}} } = map { "Not Set" } (0 .. $numRows - 1);
+        $status = 0;
+    }
+}
+
+# Set things that aren't set.
+for (my $i = 0; $i < $numRows; $i++) {
+# Simple stuff first.
+    my %known_filters = ();
+    if ($colData{STAGE}[$i] eq "Not Set") {
+        $colData{STAGE}[$i] = 'diff';
+    }
+    if ($colData{OBSCODE}[$i] eq "Not Set") {
+        $colData{OBSCODE}[$i] = 566;
+    }
+# Define filter and MJD from FPA_ID
+    if (($colData{FILTER}[$i] eq "Not Set")&&($colData{FPA_ID}[$i] ne "Not Set")) {
+        if (exists($known_filters{$colData{FPA_ID}[$i]})) {
+            $colData{FILTER}[$i] = $known_filters{$colData{FPA_ID}[$i]};
+        }
+        else {
+            my $cmd = "$regtool -processedexp -dbname $dbname -exp_name $colData{FPA_ID}[$i]";
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                run(command => $cmd, verbose => 0);
+            unless ($success) {
+                # This is a problem, because I'm not sure how we handle a failure to read something.
+                # We need to return a $PSTAMP_INVALID_REQUEST, I think, but if we can't read it, 
+                # we can't send that response back.
+                die("Unable to perform $cmd error code: $error_code");
+            }
+            foreach my $entry (split /\n/, (join "", @$full_buf)) {
+                $entry =~ s/^\s+//;
+                my @line = split /\s+/, $entry;
+                if (scalar(@line) != 3) {
+                    next;
+                }
+                my ($key,$type,$value) = @line;
+#               print "$entry => $key / $type / $value \n";
+                if ($key =~ /filter/i) {
+                    $value =~ s/.00000//;
+                    $colData{FILTER}[$i] = $value;
+                    $known_filters{$colData{FPA_ID}[$i]} = $value;
+                }
+            }
+        }
+    }
+    if (($colData{'MJD-OBS'}[$i] eq "Not Set")&&($colData{FPA_ID}[$i] ne "Not Set")) {
+        # HACK!
+        my $mjd = $colData{FPA_ID}[$i];
+        $mjd =~ s/o(....)g.*/$1/;
+        $mjd += 50000;
+        $colData{'MJD-OBS'}[$i] = $mjd;
+    }
+    if (($colData{FPA_ID}[$i] eq "Not Set")&&(($colData{'FILTER'}[$i] ne "Not Set")&&
+                                              ($colData{'MJD-OBS'}[$i] ne "Not Set"))) {
+        my $dateobs_begin = mjd_to_dateobs($colData{'MJD-OBS'}[$i]);
+        my $dateobs_end = mjd_to_dateobs($colData{'MJD-OBS'}[$i] + 1);
+        my $ra = $colData{'RA1_DEG'}[$i];
+        my $dec = $colData{'DEC1_DEG'}[$i];
+        my $filter = $colData{'FILTER'}[$i] . ".00000";
+        my $cmd = "$camtool -processedexp -dbname $dbname -filter $filter ";
+        $cmd .= " -dateobs_begin $dateobs_begin -dateobs_end $dateobs_end ";
+        $cmd .= " -ra $ra -decl $dec -radius 1.5 -limit 1";
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $cmd, verbose => 0);
+        unless ($success) {
+            # This is a problem, because I'm not sure how we handle a failure to read something.
+            # We need to return a $PSTAMP_INVALID_REQUEST, I think, but if we can't read it, 
+            # we can't send that response back.
+            die("Unable to perform $cmd error code: $error_code");
+        }
+        foreach my $entry (split /\n/, (join "", @$full_buf)) {
+            $entry =~ s/^\s+//;
+            my @line = split /\s+/, $entry;
+            if (scalar(@line) != 3) {
+                next;
+            }
+            my ($key,$type,$value) = @line;
+#               print "$entry => $key / $type / $value \n";
+            if ($key =~ /exp_name/i) {
+                $colData{FPA_ID}[$i] = $value;
+            }
+        }
     }
 }
@@ -189 +254 @@
 foreach my $colName (@unique_fields) {
     my %counter = ();
+    my $i = 0;
     foreach my $row (@{ $colData{$colName} }) {
         $counter{$row} = 1;
@@ -232 +298 @@
         my $msg;                # Message to output
         Astro::FITS::CFITSIO::fits_get_errstatus( $status , $msg );
-        die "CFITSIO error: $msg\n";
+        die "CFITSIO error: $status => $msg\n";
     }
 }
@@ -252 +318 @@
 }
 
+# Stolen from PStamp/Job.pm.  Thanks, Bill.
+sub mjd_to_dateobs {
+    my $mjd = shift;
+
+    my $ticks = ($mjd - 40587.0) * 86400;
+
+    my ($sec, $min, $hr, $day, $mon, $year) = gmtime($ticks);
+
+    return sprintf "'%4d-%02d-%02dT%02d:%02d:%02dZ'", $year+1900, $mon+1, $day, $hr, $min, $sec;
+}
+
 
 

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

@@ -108 +108 @@
 # Parse input request file using detect_query_read (as it's already written).
 #
-    my $dqr_command = "$detect_query_read --input $request_file";
+    my $dqr_command = "$detect_query_read --dbname $imagedb --input $request_file";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $dqr_command, verbose => $verbose);
@@ -308 +308 @@
 }
 close(WISDOM);
+
+# If there is anything that needs to be updated, create the update request list, and then exit the program.
 my $exit_code = 0;
 my $update_request_file = "${workdir}/update_request.dat";
@@ -316 +318 @@
             $exit_code = 25;
         }
+        elsif ($fault != 0) {
+            $exit_code = 21;
+        }
         my $update_request = join ' ', @{ $update_request{$images}{$fault} };
         print UPDATE_REQUEST "$update_request\n";
@@ -321 +326 @@
 }
 close(UPDATE_REQUEST);
-# if ($exit_code != 0) {
-#     exit($exit_code);
-# }
+if ($exit_code != 0) {
+    exit($exit_code);
+}
 
 # This duplicates stuff returned by PSTAMP, but my thought is to convert that ---^ into a conditional, in which I read
@@ -338 +343 @@
     }
 }
-#exit(10);
 
 # run ppCoord and psphotForced to calculate the required data.
@@ -569 +573 @@
         $columns = [
             # matching rownum from detectability original request
-            { name => 'ROWNUM',   type => 'V', writetype => TULONG }, 
+            { name => 'ROWNUM',   type => '20A', writetype => TSTRING }, 
             # any errors that occurred during processing
             { name => 'ERROR_CODE',   type => 'V', writetype => TULONG }, 
@@ -715 +719 @@
 #       print STDERR "$writeType $i $numRows $colName $status @{ $colData{$colName} }\n";
         $outFits->write_col( $writeType, $i + 1, 1, 1, $numRows, $colData{$colName}, $status );
+#       print "$writeType $i $numRows $colName $status\n";
         check_fitsio( $status );
-        
     }
     $outFits->close_file( $status );
@@ -730 +734 @@
         my $msg;                # Message to output
         Astro::FITS::CFITSIO::fits_get_errstatus( $status , $msg );
+        carp("CFITSIO error: $status => $msg");
         die "CFITSIO error: $msg\n";
     }

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

@@ -158 +158 @@
     }
 }
-else {
+elsif ($fault == $PSTAMP_NOT_AVAILABLE) {
     # Failed to run correctly, which means that we need to queue a job and flag data for updating.
     # Get the dependency id for the data we're requesting be updated.
@@ -191 +191 @@
     close(UPDATE_REQUEST);
 }
+else {
+    my_die ("Parse fault!!", $PS_EXIT_UNKNOWN_ERROR);
+}
 
 # This does not set the request state to stop.  That will happen with the request_finish.pl script, 

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

@@ -147 +147 @@
     #       been updated we need to go and queue it.
 
-    if ($it->{fault}) {
+    if (($it->{state} ne 'cleaned') and $it->{fault}) {
         my_die("Component faulted on update dep_id: $dep_id",
                 $PS_EXIT_SYS_ERROR);

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;

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

@@ -386 +386 @@
     $need_magic    = $proj_hash->{need_magic};
 
-    # Temporary hack so that MOPS can get at non-magicked data
+    # Temporary hack so that IFA can get at non-magicked data
     my $allow_mops_unmagicked = 1;
     if ($allow_mops_unmagicked) {
         if ($product and (($product eq "mops-pstamp-results") or
-                          ($product eq "mops-pstamp-results2"))) {
+                          ($product eq "mops-pstamp-results2") or
+                          ($product eq "ifa-pstamp-results"))) {
             $need_magic = 0;
         }

branches/eam_branches/ipp-20100621/pstamp/src/ppstampMakeStamp.c

@@ -229 +229 @@
 
 static int makeStamp(pmConfig *config, ppstampOptions *options, pmFPAfile *input,
-                pmChip *inChip, pmFPAview *view, pmAstromObj *center)
+                pmChip *inChip, pmFPAview *view, pmAstromObj *center, pmFPAfile *astrom)
 {
     int status = false;
@@ -266 +266 @@
         srcFile = input;
         *srcView = *view;
+    }
+
+    if (astrom->camera != srcFile->camera) {
+        psError(PS_ERR_UNKNOWN, true, "Input camera and astrometry camera do not match");
+        return PS_EXIT_CONFIG_ERROR;
     }
 
@@ -583 +588 @@
     if (!astrom) {
         astrom = input;
-    } else if (astrom->camera != input->camera) {
-        psError(PS_ERR_UNKNOWN, true, "Input camera and astrometry camera do not match");
-        return PS_EXIT_CONFIG_ERROR;
     }
 
@@ -636 +638 @@
         case PPSTAMP_ON:
         case PPSTAMP_PARTIALLY_ON:
-            returnval = makeStamp(config, options, input, chip, view, center);
+            returnval = makeStamp(config, options, input, chip, view, center, astrom);
             allDone = true;
             foundOverlap = true;