Changeset 40422

Timestamp:

May 6, 2018, 6:50:30 PM (8 years ago)

Author:

mhuber

Message:

merge allow update for old pstamp web request.php to access multiple images in ROI option and increase number of sample points for different images in ROI to help avoid the missing image if position in chip gap with limits for boundary issues

Location:

tags/ipp-20170121

Files:

• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (1 diff, 1 prop)
• pstamp/scripts/psmkreq (modified) (3 diffs, 1 prop)

tags/ipp-20170121/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -1664 +1664 @@
     my ($pointsList, $pointsListName) = tempfile ("/tmp/pointsList.XXXX", UNLINK => !$save_temps);
     my $npoints = 0;
+    ## MEH hack -- 
+    my $pi=3.14159265359;
+    my $tra=0.0;
+    my $tdec=0.0;
+    ##
     foreach my $row (@$rowList) {
         print $pointsList "$npoints $row->{CENTER_X} $row->{CENTER_Y}\n";
         #$npoints++;
-        ## MEH hack -- add width, height corners
+        ## MEH hack -- add width, height corners -- chip gap problem and need to add more points to try
+        ## -- need to adjust RA for DEC and check 0/360, 90 boundary (dont assume coord to image lookup will do it)
         if ( ($row->{OPTION_MASK} & $PSTAMP_MULTI_OVERLAP_IMAGE) && !($row->{COORD_MASK} & $PSTAMP_RANGE_IN_PIXELS) ){
-            ## +ra +dec corner
-            printf $pointsList "$npoints %f %f\n", $row->{CENTER_X}+$row->{WIDTH}/2.0/3600.0, $row->{CENTER_Y}+$row->{HEIGHT}/2.0/3600.0;
-            ## +ra -dec corner 
-            printf $pointsList "$npoints %f %f\n", $row->{CENTER_X}+$row->{WIDTH}/2.0/3600.0, $row->{CENTER_Y}-$row->{HEIGHT}/2.0/3600.0;
-            ## -ra +dec corner
-            printf $pointsList "$npoints %f %f\n", $row->{CENTER_X}-$row->{WIDTH}/2.0/3600.0, $row->{CENTER_Y}+$row->{HEIGHT}/2.0/3600.0;
-            ## -ra -dec corner 
-            printf $pointsList "$npoints %f %f\n", $row->{CENTER_X}-$row->{WIDTH}/2.0/3600.0, $row->{CENTER_Y}-$row->{HEIGHT}/2.0/3600.0;
+            foreach my $f (-1.0, 1.0, -1.5, 1.5, -2.0, 2.0, -2.5, 2.5) {
+                ## +/-ra +/-dec corner
+                #printf $pointsList "$npoints %f %f\n", $row->{CENTER_X}+$row->{WIDTH}/2.0/3600.0, $row->{CENTER_Y}+$row->{HEIGHT}/2.0/3600.0;
+                $tra = $row->{CENTER_X}+$row->{WIDTH}/$f/2.0/3600.0/cos($row->{CENTER_Y}/180.0*$pi);
+                $tdec = $row->{CENTER_Y}+$row->{HEIGHT}/$f/2.0/3600.0;
+                $tra = ($tra>360.0) ? $tra-360.0 : $tra;
+                $tdec = ($tdec>90.0) ? 90.0-($tdec-90.0) : $tdec;
+                printf $pointsList "$npoints %f %f\n",$tra,$tdec;
+                ## +/-ra -/+dec corner 
+                $tra = $row->{CENTER_X}+$row->{WIDTH}/$f/2.0/3600.0/cos($row->{CENTER_Y}/180.0*$pi);
+                $tdec = $row->{CENTER_Y}-$row->{HEIGHT}/$f/2.0/3600.0;
+                $tra = ($tra>360.0) ? $tra-360.0 : $tra;
+                $tdec = ($tdec>90.0) ? 90.0-($tdec-90.0) : $tdec;
+                printf $pointsList "$npoints %f %f\n",$tra,$tdec;
+                ## -/+ra side 
+                $tra = $row->{CENTER_X}-$row->{WIDTH}/$f/2.0/3600.0/cos($row->{CENTER_Y}/180.0*$pi);
+                $tdec = $row->{CENTER_Y};
+                $tra = ($tra>360.0) ? $tra-360.0 : $tra;
+                $tdec = ($tdec>90.0) ? 90.0-($tdec-90.0) : $tdec;
+                printf $pointsList "$npoints %f %f\n",$tra,$tdec;
+                ## -/+dec side 
+                $tra = $row->{CENTER_X};
+                $tdec = $row->{CENTER_Y}-$row->{HEIGHT}/$f/2.0/3600.0;
+                $tra = ($tra>360.0) ? $tra-360.0 : $tra;
+                $tdec = ($tdec>90.0) ? 90.0-($tdec-90.0) : $tdec;
+                printf $pointsList "$npoints %f %f\n",$tra,$tdec;
+            }
         }
         ####

tags/ipp-20170121/pstamp/scripts/psmkreq

@@ -29 +29 @@
 my ($ra, $dec, $x, $y, $list, $output, $req_name, $req_name_base);
 
-my ($image, $mask, $variance, $jpeg, $cmf, $psf, $backmdl, $inverse, $restorebackground);
+my ($image, $mask, $variance, $jpeg, $allroi, $cmf, $psf, $backmdl, $inverse, $restorebackground);
 my ($exptime, $expnum, $exptimejpeg, $expnumjpeg);
 my ($convolved, $unconvolved, $uncompressed, $use_imfile_id, $no_wait);
@@ -113 +113 @@
     'mask'              => \$mask,
     'jpeg'              => \$jpeg,
+    'allroi'            => \$allroi,
     'variance'          => \$variance,
     'cmf'               => \$cmf,
@@ -218 +219 @@
         $option_mask |= $PSTAMP_SELECT_VARIANCE if $variance;
         $option_mask |= $PSTAMP_SELECT_JPEG     if $jpeg;
+        $option_mask |= $PSTAMP_MULTI_OVERLAP_IMAGE     if $allroi;
 
         # if no image was requested make a stamp of the image