Changeset 33638 for branches/eam_branches/ipp-20111122/pstamp/scripts/pstampparse.pl

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/pstamp/scripts

Files:

• . (modified) (1 prop)
• pstampparse.pl (modified) (9 diffs)

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

@@ -254 +254 @@
     # If we encounter an error for a particular row add a job with the proper fault code.
 
+    my $stage = $row->{IMG_TYPE};
+
     my $rownum   = $row->{ROWNUM};
     if (!validID($rownum)) {
@@ -275 +277 @@
     }
     if ($job_type eq 'get_image') {
-        unless ($req_type eq 'byid' or $req_type eq 'byexp') {
-            print STDERR "REQ_TYPE must be 'byid' or 'byexp' for JOB_TYPE 'get_image'\n";
+        unless ($req_type eq 'byid' or $req_type eq 'byexp' or ($req_type eq 'byskycell' and $stage eq 'stack')) {
+            print STDERR "REQ_TYPE must be 'byid' or 'byexp' or byskcyell for stacks for JOB_TYPE 'get_image'\n";
             insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
             return 0;
@@ -331 +333 @@
     my $skycenter = $row->{skycenter} = ! ($row->{COORD_MASK} & $PSTAMP_CENTER_IN_PIXELS);
 
-    if (!$skycenter and !$component) {
+    if (!$skycenter and !$component and $stage ne 'stack' and !($option_mask & $PSTAMP_USE_IMFILE_ID)){
         print STDERR "COMPONENT must be specified for pixel coordinate ROI center\n";
         insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST);
@@ -337 +339 @@
     }
 
-    my $stage = $row->{IMG_TYPE};
     if (!check_image_type($stage)) {
         print STDERR "invalid IMG_TYPE for row $rownum\n";
@@ -417 +418 @@
     my $camera     = $proj_hash->{camera};
     $need_magic    = $proj_hash->{need_magic};
+    # Since user can get unmagicked data "by coordinate" requests can go back in time
+    # to dredge unusable data from the "dark days"...
+    if ($req_type eq 'bycoord' and $mjd_min eq 0) {
+            # ... so unless the user sets mjd_min clamp it to 2009-04-01
+            # XXX: This value should live in the pstampProject table not be hardcoded here
+            $mjd_min = 54922;
+    }
 
     $need_magic = 0 if $stage eq 'stack';
@@ -430 +438 @@
                 # and this user's data store destination is allowed uncensored stamps, so accept the request
                 $need_magic = 0;
-
-                # Since user can get unmagicked data "by coordinate" requests can go back in time
-                # to dredge unusable data from the "dark days"...
-                if ($req_type eq 'bycoord' and $mjd_min eq 0) {
-                    # ... so unless the user sets mjd_min clamp it to 2009-04-01
-                    # XXX: This value should live in the pstampProject table not be hardcoded here
-                    $mjd_min = 54922;
-                }
             } else {
                 print STDERR "Error row $rownum: User not authorized to to request uncensored stamps.\n";
@@ -463 +463 @@
     my $numRows = scalar @$rowList;
 
+    if (($req_type eq 'byskycell') or ($req_type eq 'bycoord')) {
+        # avoid error from print below if $id isn't needed
+        $id = "" if !$id;
+    }
     print "Collected $numRows rows beginning with row $rownum. $req_type $stage $id $tess_id $component\n";
     
@@ -521 +525 @@
     my $h = $row->{HEIGHT};
     my $coord_mask = $row->{COORD_MASK};
+    my $wholeFile = 0; 
     if ($coord_mask & $PSTAMP_CENTER_IN_PIXELS) {
-        $roi_string = "-pixcenter $x $y";
+        # Center of 0, 0 in pixel coordinates is interpreted to mean
+        # return the entire file
+        if ($x == 0 && $y == 0) {
+            $roi_string = "-wholefile";
+            $wholeFile = 1;
+        } else {
+            $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 (!$wholeFile) {
+        if ($coord_mask & $PSTAMP_RANGE_IN_PIXELS) {
+            $roi_string .= " -pixrange $w $h";
+        } else {
+            $roi_string .= " -arcrange $w $h";
+        }
     }
 
@@ -566 +580 @@
         $args .= " -class_id $component" if $component;
     }
-
-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;