Changeset 29388

Timestamp:

Oct 13, 2010, 11:14:15 AM (16 years ago)

Author:

bills

Message:

Look up set of mask bits to not censor in camera.config. Add STARCORE and SPIKE to the list
of bits not censored

Location:

trunk

Files:

• ippconfig/gpc1/camera.config (modified) (1 diff)
• psModules/src/extras/Makefile.am (modified) (2 diffs)
• psModules/src/psmodules.h (modified) (1 diff)
• pstamp/src/ppstampMakeStamp.c (modified) (2 diffs)

trunk/ippconfig/gpc1/camera.config

@@ -160 +160 @@
 NPIX_MAX                    S32     1455690816
 NPIX_INTERCHIP          S32     103794483
+
+# The set of maskbits that should not be set to NAN in "released" images
+# This value is equal to CONV.POOR | STARCORE | SPIKE | SUSPECT
+MASK.NO.CENSOR      U32      0x5280
+

trunk/psModules/src/extras/Makefile.am

@@ -10 +10 @@
         pmVisual.c \
         pmVisualUtils.c \
-        ippStages.c
+        ippStages.c \
+        pmCensor.c
 
 pkginclude_HEADERS = \
@@ -20 +21 @@
         pmVisualUtils.h \
         ippDiffMode.h \
-        ippStages.h
+        ippStages.h \
+        pmCensor.h
 
 CLEANFILES = *~

trunk/psModules/src/psmodules.h

@@ -13 +13 @@
 #include <ippStages.h>
 #include <ippDiffMode.h>
+#include <pmCensor.h>
 
 // XXX the following headers define constructs needed by the elements below

trunk/pstamp/src/ppstampMakeStamp.c

@@ -679 +679 @@
 static bool setMaskedToNAN(pmConfig *config, psImage *image, psImage *mask, psImage *variance)
 {
+#ifdef notdef
     bool status;
     psMetadata *masks = psMetadataLookupMetadata(&status, config->recipes, "MASKS");
@@ -724 +725 @@
         }
     }
-    fprintf(stderr, "excised %ld masked pixels\n", numExcised);
+#endif
+
+    long numCensored;
+    if (!pmCensorMasked(config, image, mask, variance, &numCensored)) {
+        psError(PS_ERR_UNKNOWN, false, "Failed to censor masked pixels.\n");
+        return false;
+    }
+
+    // XXX: this shouldn't be a fprintf
+    fprintf(stderr, "Censored %ld masked pixels\n", numCensored);
 
     return true;