Changeset 34041 for branches/meh_branches/ppstack_test/pstamp/scripts

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• pstamp/scripts/pstamp_cleanup.pl (modified) (2 diffs)
• pstamp/scripts/pstamp_finish.pl (modified) (1 diff)
• pstamp/scripts/pstamp_job_run.pl (modified) (1 diff)
• pstamp/scripts/pstampparse.pl (modified) (5 diffs)

branches/meh_branches/ppstack_test/pstamp/scripts/pstamp_cleanup.pl

@@ -42 +42 @@
     'name=s'            =>  \$name,
     'outdir=s'          =>  \$outdir,
-    'reqType=s'           =>  \$reqType,
+    'reqType=s'         =>  \$reqType,
     'product=s'         =>  \$product,
     'uri=s'             =>  \$uri,
-    'outdir=s'          =>  \$outdir,
     'redirect-output'   =>  \$redirect_output,
     'verbose'           =>  \$verbose,
@@ -82 +81 @@
 
 my_die("Cleanup not yet supported for reqType: $reqType", $req_id, $PS_EXIT_UNKNOWN_ERROR)
-    if ($reqType ne "pstamp") and ($reqType ne "NULL");
+    if ($reqType ne "pstamp") and ($reqType ne "NULL") and ($reqType ne "dquery");
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files

branches/meh_branches/ppstack_test/pstamp/scripts/pstamp_finish.pl

@@ -201 +201 @@
                 # process the reglist file to get the list of files produced by this job
                 foreach my $line (<JRL>) {
+
+                    # XXX: we are getting many cases where the size and/or md5sum calculated by
+                    # the job has changed by the time the request_finish has run
+                    # Don't
                     # add line to the requests's reglist
-                    print $rlf $line;
+                    # ....
+#                    print $rlf $line;
+
 
                     chomp $line;
-                    my ($img_name, undef) = split '\|', $line;
+                    my ($img_name, $reported_size, $reported_sum, $filetype) = split '\|', $line;
+                    # ... instead let dsreg compute the paramters by leaving them blank
+                    print $rlf "$img_name|||$filetype|\n";
 
                     # add line to the table definition file

branches/meh_branches/ppstack_test/pstamp/scripts/pstamp_job_run.pl

@@ -226 +226 @@
     my $command = "$ppstamp $outputBase $argString $fileArgs";
     $command .= " -write_jpeg" if ($options & $PSTAMP_SELECT_JPEG);
+    $command .= " -nocompress" if ($options & $PSTAMP_SELECT_UNCOMPRESSED);
+    $command .= " -stage $stage";
+    $command .= " -censor_masked" if $nan_masked;
     $command .= " -dbname $dbname" if $dbname;
     $command .= " -dbserver $dbserver" if $dbserver;
-    $command .= " -stage $stage";
-    $command .= " -no_censor_masked" unless $nan_masked;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);

branches/meh_branches/ppstack_test/pstamp/scripts/pstampparse.pl

@@ -333 +333 @@
     my $skycenter = $row->{skycenter} = ! ($row->{COORD_MASK} & $PSTAMP_CENTER_IN_PIXELS);
 
-    if (!$skycenter and !$component) {
+    my $wholefile = 0;
+    if (!$skycenter && $row->{CENTER_X} == 0 && $row->{CENTER_Y} == 0) {
+        # Secret code for returning the whole file
+        $wholefile = 1;
+    }
+
+    if (!$skycenter and !$wholefile 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);
@@ -418 +424 @@
     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';
@@ -431 +444 @@
                 # 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";
@@ -526 +531 @@
     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";
+        }
     }
 
@@ -571 +586 @@
         $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;