Changeset 21183 for trunk/ppStats

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/ppStats/src

Files:

• ppStats.h (modified) (4 diffs)
• ppStatsFPA.c (modified) (1 diff)
• ppStatsMetadata.c (modified) (1 diff)
• ppStatsPixels.c (modified) (1 diff)
• ppStatsReadout.c (modified) (3 diffs)

trunk/ppStats/src/ppStats.h

@@ -24 +24 @@
     bool doFirstReadout3D;              // for 3D data, use the first readout?
     float sample;                       // Fraction of cell to sample for statistics
-    psMaskType maskVal;                 // Mask value for images
+    psImageMaskType maskVal;            // Mask value for images
     psList *chips;                      // Chips to look at
     psList *cells;                      // Cells to look at
@@ -45 +45 @@
                        pmFPA *fpa,         // FPA for which to get statistics
                        pmFPAview *view,    // View for analysis
-                       psMaskType maskVal, // Value to mask
+                       psImageMaskType maskVal, // Value to mask
                        pmConfig *config    // Configuration
     );
@@ -77 +77 @@
                           pmFPA *fpa,         // FPA for which to get statistics
                           pmFPAview *view,    // View for analysis
-                          psMaskType maskVal, // Value to mask
+                          psImageMaskType maskVal, // Value to mask
                           pmConfig *config    // Configuration
     );
@@ -85 +85 @@
                             pmFPA *fpa,         // FPA for which to get statistics
                             pmFPAview *view,    // View for analysis
-                            psMaskType maskVal, // Value to mask
+                            psImageMaskType maskVal, // Value to mask
                             pmConfig *config    // Configuration
     );

trunk/ppStats/src/ppStatsFPA.c

@@ -4 +4 @@
                        pmFPA *fpa,         // FPA for which to get statistics
                        pmFPAview *view,    // View for analysis
-                       psMaskType maskVal, // Value to mask
+                       psImageMaskType maskVal, // Value to mask
                        pmConfig *config    // Configuration
     )

trunk/ppStats/src/ppStatsMetadata.c

@@ -5 +5 @@
                             pmFPA *fpa,         // FPA for which to get statistics
                             pmFPAview *view,    // View for analysis
-                            psMaskType maskVal, // Value to mask
+                            psImageMaskType maskVal, // Value to mask
                             pmConfig *config    // Configuration
     )

trunk/ppStats/src/ppStatsPixels.c

@@ -5 +5 @@
                           pmFPA *fpa,         // FPA for which to get statistics
                           pmFPAview *view,    // View for analysis
-                          psMaskType maskVal, // Value to mask
+                          psImageMaskType maskVal, // Value to mask
                           pmConfig *config    // Configuration
     )

trunk/ppStats/src/ppStatsReadout.c

@@ -63 +63 @@
         int sampleSpace = 1.0 / data->sample; // Space between samples
         psVector *sampleValues = psVectorAlloc(numSamples, PS_TYPE_F32); // Vector of samples
-        psVector *sampleMask = psVectorAlloc(numSamples, PS_TYPE_MASK);  // Corresponding mask
-        if (!mask) {
-            psVectorInit(sampleMask, 0);
-        }
+        psVector *sampleMask = psVectorAlloc(numSamples, PS_TYPE_VECTOR_MASK);  // Corresponding mask
+        psVectorInit(sampleMask, 0);
+
         for (int i = 0; i < numSamples; i++) {
             int j = i * sampleSpace;
@@ -72 +71 @@
             int x = j % image->numCols;
             sampleValues->data.F32[i] = image->data.F32[y][x];
-            if ((!mask || !(mask->data.PS_TYPE_MASK_DATA[y][x] & data->maskVal)) &&
-                !isfinite(sampleValues->data.F32[i])) {
-                if (!warnNonFinite) {
-                    psWarning("Unmasked non-finite value detected at %d,%d; suppressing further warnings",
-                              x, y);
-                    warnNonFinite = true;
-                }
-                sampleMask->data.PS_TYPE_MASK_DATA[i] = data->maskVal;
-            } else if (mask) {
-                sampleMask->data.PS_TYPE_MASK_DATA[i] = mask->data.PS_TYPE_MASK_DATA[y][x];
-            }
-        }
-        if (!psVectorStats(data->stats, sampleValues, NULL, sampleMask, data->maskVal)) {
+
+            // ignore the sampleMask if there is no input mask
+            if (!mask) continue;
+
+            // if this pixel is masked, set the sample mask
+            if (mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & data->maskVal) {
+                sampleMask->data.PS_TYPE_VECTOR_MASK_DATA[i] = 1;
+                continue;
+            }
+
+            // mask any unmasked NAN/INF values
+            if (!isfinite(sampleValues->data.F32[i])) {
+                // warn for the first unmasked NAN/INF value
+                if (!warnNonFinite) {
+                    psWarning("Unmasked non-finite value detected at %d,%d; suppressing further warnings", x, y);
+                    warnNonFinite = true;
+                }
+                sampleMask->data.PS_TYPE_VECTOR_MASK_DATA[i] = 1;
+            } 
+        }
+        if (!psVectorStats(data->stats, sampleValues, NULL, sampleMask, 1)) {
             psWarning("Unable to perform statistics on readout %s.\n", readoutName);
             psErrorClear();
@@ -179 +186 @@
                 for (int j = 0; j < readout->mask->numRows; j++) {
                     for (int i = 0; i < readout->mask->numCols; i++) {
-                        if (readout->mask->data.PS_TYPE_MASK_DATA[j][i] & data->maskVal) {
+                        if (readout->mask->data.PS_TYPE_IMAGE_MASK_DATA[j][i] & data->maskVal) {
                             numBad++;
                         }