Changeset 29906 for branches/eam_branches/ipp-20101103/pstamp/src

Timestamp:

Dec 3, 2010, 2:35:32 AM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20101103/pstamp/src

Files:

• ppstampArguments.c (modified) (2 diffs)
• ppstampMakeStamp.c (modified) (1 diff)
• ppstampOptions.c (modified) (1 diff)
• ppstampOptions.h (modified) (1 diff)

branches/eam_branches/ipp-20101103/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

branches/eam_branches/ipp-20101103/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;

branches/eam_branches/ipp-20101103/pstamp/src/ppstampOptions.c

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

branches/eam_branches/ipp-20101103/pstamp/src/ppstampOptions.h

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