Changeset 40389 for trunk

Timestamp:

Apr 12, 2018, 9:10:37 AM (8 years ago)

Author:

mhuber

Message:

mod to pstamp to provide multiple images for all overlapping pixels in the ROI for byexp and skycoords request using last open OPTION_MASK 8192 value (ie MOPS)

Location:

trunk

Files:

• PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (modified) (2 diffs)
• PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (modified) (2 diffs)
• pstamp/scripts/pstamp_job_run.pl (modified) (1 diff)
• pstamp/src/ppstampArguments.c (modified) (2 diffs)
• pstamp/src/ppstampMakeStamp.c (modified) (1 diff)
• pstamp/src/ppstampOptions.h (modified) (1 diff)
• pstamp/src/pstamp.h (modified) (1 diff)

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm

@@ -1666 +1666 @@
     foreach my $row (@$rowList) {
         print $pointsList "$npoints $row->{CENTER_X} $row->{CENTER_Y}\n";
-        $npoints++;
+        #$npoints++;
+        ## MEH hack -- add width, height corners
+        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}/3600.0, $row->{CENTER_Y}+$row->{HEIGHT}/3600.0;
+            #$npoints++;
+            ## +ra -dec corner 
+            printf $pointsList "$npoints %f %f\n", $row->{CENTER_X}+$row->{WIDTH}/3600.0, $row->{CENTER_Y}-$row->{HEIGHT}/3600.0;
+            #$npoints++;
+            ## -ra +dec corner
+            printf $pointsList "$npoints %f %f\n", $row->{CENTER_X}-$row->{WIDTH}/3600.0, $row->{CENTER_Y}+$row->{HEIGHT}/3600.0;
+            #$npoints++;
+            ## -ra -dec corner 
+            printf $pointsList "$npoints %f %f\n", $row->{CENTER_X}-$row->{WIDTH}/3600.0, $row->{CENTER_Y}-$row->{HEIGHT}/3600.0;
+            #$npoints++;
+        }
+        ####
+        $npoints++;
         # this gets overwitten if an overlapping image is found
         $row->{error_code} = $PSTAMP_NO_OVERLAP;
@@ -1725 +1742 @@
                     $ref = $components{$component} = [];
                 }
-                push @$ref, $ptnum;
+                #push @$ref, $ptnum;
+                ## MEH hack -- only push ptnum if not already, so check if ptnum in list 
+                push(@$ref, $ptnum) unless grep{$_ == $ptnum} @$ref;
+                ##
                 my $row = $rowList->[$ptnum];
                 # this row found a match

trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm

@@ -35 +35 @@
                     $PSTAMP_SELECT_UNCONV
                     $PSTAMP_RESTORE_BACKGROUND
+                    $PSTAMP_MULTI_OVERLAP_IMAGE
                     $PSTAMP_USE_IMFILE_ID
                     $PSTAMP_NO_WAIT_FOR_UPDATE
@@ -81 +82 @@
 our $PSTAMP_SELECT_UNCONV       = 2048;
 our $PSTAMP_RESTORE_BACKGROUND  = 4096;
-# unused 8192
-
+# MEH -- previously unused 8192
+our $PSTAMP_MULTI_OVERLAP_IMAGE  = 8192; 
 our $PSTAMP_USE_IMFILE_ID      = 16384;
 our $PSTAMP_NO_WAIT_FOR_UPDATE = 32768;

trunk/pstamp/scripts/pstamp_job_run.pl

@@ -248 +248 @@
         $command .= " -stage $stage";
         $command .= " -forheader $calibfile" if $calibfile;
+        ## MEH hack for centeroffchip -- needs constraint for coord_mask 0 all in sky values..
+        $command .= " -centeroffchip" if ($options & $PSTAMP_MULTI_OVERLAP_IMAGE);
+
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);

trunk/pstamp/src/ppstampArguments.c

@@ -31 +31 @@
     fprintf(stderr, "   [-write_cmf]          : create an output cmf with the sources overlapping the stamp\n");
     fprintf(stderr, "   [-wholefile]          : ignore the region of interest and process the entire input image\n");
+    fprintf(stderr, "   [-centeroffchip]          : allow center to be off chip boundary and include any pixels in ROI (testing) \n");
     // fprintf(stderr, "   [-no_censor_masked]   : do not set masked pixels to NAN\n");
     fprintf(stderr, "\n");
@@ -66 +67 @@
     *pOptions = options;
 
+    if ((argnum = psArgumentGet(argc, argv, "-centeroffchip"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        options->centeroffchip = true;
+    }
+        
     if ((argnum = psArgumentGet(argc, argv, "-wholefile"))) {
         psArgumentRemove(argnum, &argc, argv);

trunk/pstamp/src/ppstampMakeStamp.c

@@ -592 +592 @@
     }
 
-    if (onChip) {
+    //MEH add hack for ROI not to include center on chip
+    if (onChip || options->centeroffchip ) {
         if (options->roip.celestialRange) {
             findBoundingBox(options, input->fpa, chip, center);

trunk/pstamp/src/ppstampOptions.h

@@ -8 +8 @@
     // input arguments
     pstampROI   roip;
+    bool        centeroffchip;
     bool        wholeFile;
     psString    chipName;

trunk/pstamp/src/pstamp.h

@@ -43 +43 @@
 #define PSTAMP_SELECT_UNCONV        2048
 #define PSTAMP_RESTORE_BACKGROUND   4096
-// unused                           8192
+// MEH -- previously unused                           8192
+#define PSTAMP_MULTI_OVERLAP_IMAGE  8192
 #define PSTAMP_USE_IMFILE_ID        16384