Changeset 29886

Timestamp:

Nov 30, 2010, 3:30:00 PM (15 years ago)

Author:

bills

Message:

from trunk. Don't set masked pixels to NAN unless the input
image is destreaked

Location:

tags/ipp-20101029/pstamp

Files:

• . (modified) (1 prop)
• scripts/pstamp_checkdependent.pl (modified) (1 prop)
• scripts/pstamp_job_run.pl (modified) (1 diff)
• scripts/pstamp_request_file (modified) (1 prop)
• src/ppstampArguments.c (modified) (2 diffs)
• src/ppstampMakeStamp.c (modified) (1 diff)
• src/ppstampOptions.c (modified) (1 diff)
• src/ppstampOptions.h (modified) (1 diff)

tags/ipp-20101029/pstamp/scripts/pstamp_job_run.pl

@@ -119 +119 @@
     $command .= " -dbserver $dbserver" if $dbserver;
     $command .= " -stage $params->{stage}" if $params->{stage};
+    $command .= " -no_censor_masked" unless $nan_masked;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);

tags/ipp-20101029/pstamp/src/ppstampArguments.c

@@ -25 +25 @@
     fprintf(stderr, "   [-mask   mk_image] :     mask image\n");
     fprintf(stderr, "   [-variance var_image] :  variance image\n");
+    fprintf(stderr, "   [-no_censor_masked] : do not set masked pixels to NAN\n");
     fprintf(stderr, "\n");
 
@@ -95 +96 @@
     }
     
+    if ((argnum = psArgumentGet(argc, argv, "-no_censor_masked"))) {
+        psArgumentRemove(argnum, &argc, argv);
+        options->censorMasked = false;
+    }
 
     // finally the output file

tags/ipp-20101029/pstamp/src/ppstampMakeStamp.c

@@ -327 +327 @@
             }
 
-            if (!setMaskedToNAN(config, outReadout->image, outReadout->mask, outReadout->variance)) {
+            if (options->censorMasked && !setMaskedToNAN(config, outReadout->image, outReadout->mask, outReadout->variance)) {
                  psError(PS_ERR_UNKNOWN, false, "failed to create postage stamp mask image\n");
                  status = false;

tags/ipp-20101029/pstamp/src/ppstampOptions.c

@@ -28 +28 @@
     options->roip.dDEC = 0;
     options->chipName  = NULL;
+    options->censorMasked = true;
 
     return options;

tags/ipp-20101029/pstamp/src/ppstampOptions.h

@@ -15 +15 @@
     //
     psRegion    roi;            // roi in chip coordinates
+    bool        censorMasked;
 
 } ppstampOptions;