Changeset 21183 for trunk/ppImage/src

Timestamp:

Jan 26, 2009, 8:40:07 PM (17 years ago)

Author:

eugene

Message:

incorporating changes from 16bit mask upgrades (eam_branch_20081230)

Location:

trunk/ppImage/src

Files:

• ppImage.h (modified) (1 diff)
• ppImageCleanup.c (modified) (1 diff)
• ppImageLoop.c (modified) (4 diffs)
• ppImageReplaceBackground.c (modified) (4 diffs)
• ppImageSetMaskBits.c (modified) (1 diff)

trunk/ppImage/src/ppImage.h

@@ -58 +58 @@
 
     // make values for abstract concepts of masking
-    psMaskType maskValue;               // apply this bit-mask to choose masked bits
-    psMaskType markValue;               // apply this bit-mask to choose masked bits
-    psMaskType satMask;                 // Mask value to give saturated pixels
-    psMaskType badMask;                 // Mask value to give bad pixels
-    psMaskType flatMask;                // Mask value to give bad flat pixels
-    psMaskType blankMask;               // Mask value to give blank pixels
+    psImageMaskType maskValue;               // apply this bit-mask to choose masked bits
+    psImageMaskType markValue;               // apply this bit-mask to choose masked bits
+    psImageMaskType satMask;                 // Mask value to give saturated pixels
+    psImageMaskType badMask;                 // Mask value to give bad pixels
+    psImageMaskType flatMask;                // Mask value to give bad flat pixels
+    psImageMaskType blankMask;               // Mask value to give blank pixels
 
     // non-linear correction parameters

trunk/ppImage/src/ppImageCleanup.c

@@ -23 +23 @@
     // fprintf (stderr, "Found %d leaks at %s\n", Nleaks, "ppImage");
 
-    fprintf(stderr, "Found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "ppImage");
+    // fprintf(stderr, "Found %d leaks at %s\n", psMemCheckLeaks (0, NULL, NULL, false), "ppImage");
+    fprintf(stderr, "Found %d leaks at %s\n", psMemCheckLeaks (0, NULL, stdout, false), "ppImage");
 
     return;

trunk/ppImage/src/ppImageLoop.c

@@ -126 +126 @@
         }
 
-        // measure various statistics for this image
+        // measure various pixel-based statistics for this image
         if (!ppImagePixelStats(config, stats, options, view)) {
-            ESCAPE("Unable to measures stats for image");
+            ESCAPE("Unable to measures pixel stats for image");
         }
         if (!ppImageMosaicChip(config, options, view, "PPIMAGE.CHIP", "PPIMAGE.OUTPUT")) {
@@ -209 +209 @@
     }
 
-    // Write out summary statistics
+    // Calculate summary statistics from FPA Metadata
     if (!ppImageMetadataStats(config, stats, options)) {
-        ESCAPE("Unable to write statistics file.");
+        ESCAPE("Unable to determine FPA-level metadata statistics.");
     }
 
@@ -218 +218 @@
         ESCAPE("save failure for FPA");
     }
-
     psFree(view);
 
@@ -230 +229 @@
         }
     }
+    psFree (stats);
 
     return true;

trunk/ppImage/src/ppImageReplaceBackground.c

@@ -30 +30 @@
     // XXX Should this be options->maskValue or options->maskValue & ~options->satMask?
     //     The latter will leave saturated pixels high
-    psMaskType maskVal = options->maskValue;
+    psImageMaskType maskVal = options->maskValue;
 
     // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
-    psMetadataAddU8(psphotRecipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", maskVal);
+    psMetadataAddImageMask(psphotRecipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", maskVal);
 
     // Since we are working on a chip-mosaicked image, there should only be a single cell and readout
@@ -146 +146 @@
             if (!isfinite(value)) {
                 image->data.F32[y][x] = NAN;
-                mask->data.PS_TYPE_MASK_DATA[y][x] |= options->badMask;
+                mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= options->badMask;
             } else {
                 image->data.F32[y][x] -= value;
@@ -157 +157 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
-            if (mask && mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal) {
+            if (mask && mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskVal) {
                 image->data.F32[y][x] = 0.0;
             } else {
@@ -163 +163 @@
                 if (!isfinite(value)) {
                     image->data.F32[y][x] = NAN;
-                    mask->data.PS_TYPE_MASK_DATA[y][x] |= options->badMask;
+                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= options->badMask;
                 } else {
                     image->data.F32[y][x] -= value;

trunk/ppImage/src/ppImageSetMaskBits.c

@@ -38 +38 @@
 
     // set maskValue and markValue in the psphot recipe
-    psMetadataAddU8 (recipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", options->maskValue);
-    psMetadataAddU8 (recipe, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE, "user-defined mask", options->markValue);
+    psMetadataAddImageMask (recipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", options->maskValue);
+    psMetadataAddImageMask (recipe, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE, "user-defined mask", options->markValue);
 
     return true;