Changeset 40483 for branches/czw_branch/20170908/pstamp

Timestamp:

Jun 27, 2018, 3:31:55 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908

Files:

• . (modified) (1 prop)
• pstamp/scripts/psmkreq (modified) (3 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)

branches/czw_branch/20170908/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

branches/czw_branch/20170908/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);

branches/czw_branch/20170908/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);

branches/czw_branch/20170908/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);

branches/czw_branch/20170908/pstamp/src/ppstampOptions.h

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

branches/czw_branch/20170908/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