Changeset 27517 for branches/eam_branches/20100225/pstamp/scripts/pstampparse.pl

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

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

branches/eam_branches/20100225/pstamp/scripts/pstampparse.pl

@@ -151 +151 @@
         print STDERR @$stderr_buf;
     }
-    my $table =  $mdcParser->parse(join "", @$stdout_buf) or
-        my_die("Unable to parse metdata config doc", $PS_EXIT_UNKNOWN_ERROR);
-
-    $rows = parse_md_list($table);
+    if (@$stdout_buf) {
+        my $table =  $mdcParser->parse(join "", @$stdout_buf) or
+            my_die("Unable to parse metdata config doc", $PS_EXIT_UNKNOWN_ERROR);
+        $rows = parse_md_list($table);
+    }
+
 }
 
@@ -191 +193 @@
 
     my $filter  = $row->{REQFILT};
+    if ($filter) {
+        if (length($filter) == 1) {
+            # allow single character filter cuts to work
+            $filter .= '%';
+        }
+    }
     my $mjd_min = $row->{MJD_MIN};
     my $mjd_max = $row->{MJD_MAX};
@@ -197 +205 @@
         # backwards compatability hook
         $data_group = $row->{LABEL};
+        $data_group = "null" if !defined $data_group;
+        $row->{DATA_GROUP} = $data_group;
     }
         
@@ -202 +212 @@
     my $y       = $row->{CENTER_Y};
 
+    # XXX things don't work if bit zero of option mask is not set;
+    $row->{OPTION_MASK} |= 1;
     my $option_mask= $row->{OPTION_MASK};
     my $inverse = ($option_mask & $PSTAMP_SELECT_INVERSE) ? 1 : 0;
     $row->{inverse} = $inverse;
+    my $unconvolved = ($option_mask & $PSTAMP_SELECT_UNCONV) ? 1 : 0;
+    $row->{unconvolved} = $unconvolved;
 
     my $skycenter = $row->{skycenter} = ! ($row->{COORD_MASK} & $PSTAMP_CENTER_IN_PIXELS);
@@ -217 +231 @@
     }
 
+    # user requested us to search all components. Set to ""
     $search_component = "" if $search_component eq "all";
 
@@ -226 +241 @@
     }
 
+    if (($req_type eq "byexp") and ($stage eq "stack")) {
+        print STDERR "byexp not implemented for stack stage. row: $rownum\n" if $verbose;
+        insertFakeJobForRow($row, 1, $PSTAMP_NOT_IMPLEMENTED);
+        $num_jobs++;
+        next;
+    }
+
     
     # $mode list_uri is a debugging mode (it may used by the http interface)
@@ -236 +258 @@
 
     # Temporary hack so that MOPS can get at non-magicked data
-    if ($product and ($product eq "mops-pstamp-results")) {
-        $need_magic = 0;
-    }
+#    if ($product and ($product eq "mops-pstamp-results")) {
+#        $need_magic = 0;
+#    }
 
     # For "stamp" and "list_uri" jobs collect rows with the same images of interest in a list so that they
@@ -267 +289 @@
             next;
         }
-        if ($stage eq "stack") {
-            print STDERR "lookup bycoord is not yet implemented for stage stack" if $verbose;
-            insertFakeJobForRow($row, 1, $PSTAMP_NOT_IMPLEMENTED);
+    }
+    if (($req_type eq "byid") or ($req_type eq "bydiff")) {
+        if (!validID($id)) {
+            print STDERR "ID must be a positive integer for req_type $req_type\n" if $verbose;
+            insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
             $num_jobs++;
             next;
@@ -277 +301 @@
     # request specification. An array reference is returned.
     $imageList = locate_images($ipprc, $image_db, $req_type, $stage, $id, $tess_id, $search_component,
-                $inverse, $need_magic, $x, $y, $mjd_min, $mjd_max, $filter, $data_group, $verbose);
+                $option_mask, $need_magic, $x, $y, $mjd_min, $mjd_max, $filter, $data_group, $verbose);
 
     if (!$imageList or !@$imageList) {
@@ -291 +315 @@
 }
 
-if (($mode eq "queue_jobs") and ($num_jobs eq 0)) {
+if (($mode eq "queue_job") and ($num_jobs eq 0)) {
     print STDERR "no jobs created for $req_name\n" if $verbose;
-    insertFakeJobForRow(undef, 0, $PSTAMP_UNKNOWN_ERROR);
+    insertFakeJobForRow(undef, 0, $PSTAMP_INVALID_REQUEST);
 }
 
@@ -317 +341 @@
     my $roi_string;
 
-    # note values were insured to be numbers in validROI()
+    # note values were checked by the function validROI()
     my $x = $row->{CENTER_X};
     my $y = $row->{CENTER_Y};
@@ -323 +347 @@
     my $h = $row->{HEIGHT};
     my $coord_mask = $row->{COORD_MASK};
-    if ($x && ($x ne "null") && $y && ($y ne "null") && $w && ($w ne "null") && $h && ($h ne "null")) {
-        if ($coord_mask & $PSTAMP_CENTER_IN_PIXELS) {
-            $roi_string = "-pixcenter $x $y";
-        } else {
-            $roi_string = "-skycenter $x $y";
-        }
-        if ($coord_mask & $PSTAMP_RANGE_IN_PIXELS) {
-            $roi_string .= " -pixrange $w $h";
-        } else {
-            $roi_string .= " -arcrange $w $h";
-        }
+    if ($coord_mask & $PSTAMP_CENTER_IN_PIXELS) {
+        $roi_string = "-pixcenter $x $y";
+    } else {
+        $roi_string = "-skycenter $x $y";
+    }
+    if ($coord_mask & $PSTAMP_RANGE_IN_PIXELS) {
+        $roi_string .= " -pixrange $w $h";
+    } else {
+        $roi_string .= " -arcrange $w $h";
     }
 
@@ -354 +376 @@
         if (($stage ne "stack") and ($need_magic and !$image->{magicked})) {
             # XXX: should we add a faulted job so the client can know what happened if no images come back?
-            # This test is made in locate_images now so this code never runs. This leads to no feedback
-            # to users, but speeds up processing significatnly
+            # The test for destreaked is made in locate_images now so this code never runs. This leads to no feedback
+            # to users, but speeds up processing significantly
             print STDERR "skipping non-magicked image $imagefile\n" if $verbose;
 
@@ -391 +413 @@
         }
 
-        my $base = basename($image->{path_base});
+        my $base = basename($image->{image});
+        if (! $base =~ /.fits$/ ) {
+            my_die("unexpected image file name found $image->{image}", $PS_EXIT_PROG_ERROR);
+        }
+        $base =~ s/.fits$//;
+            
         # XXX: TODO use filerule for this. I don't have a camera defined here
         if (($stage eq 'chip') and ($image->{camera} eq 'GPC1')) {
@@ -724 +751 @@
         $job_type = $row->{JOB_TYPE};
         $rownum = $row->{ROWNUM};
+        $rownum = 0 if !defined $rownum;
+        if ($job_type) {
+            if (($job_type ne "stamp") and ($job_type ne "get_image")) {
+                print STDERR "invalid job type: $job_type found in row $rownum\n";
+                $job_type = "none";
+            }
+        } else {
+            print STDERR "undefined job type found in row $rownum\n";
+            $job_type = "none";
+        }
     } else {
         $job_type = "none";
@@ -799 +836 @@
     my $r2 = shift;
 
+    return 0 if (($r1->{REQ_TYPE} eq "bycoord") or ($r2->{REQ_TYPE} eq "bycoord"));
     return 0 if ($r1->{PROJECT}  ne $r2->{PROJECT});
     return 0 if ($r1->{JOB_TYPE} ne $r2->{JOB_TYPE});
@@ -810 +848 @@
     return 0 if ($r1->{MJD_MAX}  ne $r2->{MJD_MAX});
     return 0 if ($r1->{inverse}  ne $r2->{inverse});
+    return 0 if ($r1->{unconvolved}  ne $r2->{unconvolved});
 
     if (defined($r1->{COMPONENT})) {
@@ -828 +867 @@
     my $val = shift;
 
-    return $val =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/;
+    return 0 if !defined $val;
+
+    return ($val =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/);
+}
+sub validID
+{
+    my $val = shift;
+
+    return 0 if !$val;
+
+    return  ! ($val =~ /\D/);
 }