Changeset 25022 for branches/eam_branches/20090715/ppImage/src/ppImageDetrendFringe.c

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

• . (modified) (1 prop)
• ppImage/src/ppImageDetrendFringe.c (modified) (5 diffs)

branches/eam_branches/20090715/ppImage/src/ppImageDetrendFringe.c

@@ -11 +11 @@
     PS_ASSERT_PTR_NON_NULL(options, false);
 
-    // Reference fringe measurements
-    psArray *references = psMemIncrRefCounter(psMetadataLookupPtr(NULL, fringe->analysis,
-                                                                  "FRINGE.MEASUREMENTS"));
+    // Reference fringe measurements (stored on the reference cell->analysis)
+    psArray *references = psMemIncrRefCounter(psMetadataLookupPtr(NULL, fringe->analysis, "FRINGE.MEASUREMENTS"));
     if (!references) {
-        references = pmFringesParse(fringe); // Reference fringes
-        if (!references) {
-            psError(PS_ERR_IO, false, "Unable to find fringe references.\n");
-            return false;
-        }
-        psMetadataAdd(fringe->analysis, PS_LIST_TAIL, "FRINGE.MEASUREMENTS", PS_DATA_UNKNOWN,
-                      "Fringe measurements", references);
+        psError(PS_ERR_IO, false, "Unable to find fringe references.\n");
+        return false;
     }
 
@@ -75 +69 @@
     }
 
-    psMetadataAdd(readout->parent->analysis, PS_LIST_TAIL, scienceFringes,
-                  PS_DATA_UNKNOWN | PS_META_REPLACE, "Fringe measurements", measurements);
+    psMetadataAdd(readout->parent->analysis, PS_LIST_TAIL, scienceFringes, PS_DATA_UNKNOWN | PS_META_REPLACE, "Fringe measurements", measurements);
     psFree(measurements);
     psFree(scienceFringes);
@@ -92 +85 @@
     psArray *fringes = psArrayAlloc(cells->n); // Fringes, to return
     for (int i = 0; i < cells->n; i++) {
+        fringes->data[i] = NULL;
+
         pmCell *cell = cells->data[i];  // Cell of interest
 
         // XXX for now, skip the video cells (cell->readouts->n > 1)
         if (cell->readouts->n > 1) {
-          psWarning ("Skipping Video Cell for ppImageDetrendFringe.c:getFringes");
-          continue;
+            psWarning ("Skipping Video Cell (%d) for ppImageDetrendFringe.c:getFringes", i);
+            continue;
         }
 
@@ -197 +192 @@
     }
     assert(fringes->readouts->n == solution->nFringeFrames);
+
+    psImageMaskType maskVal = options->flatMask;
 
     bool mdok;                          // Status of MD lookup
@@ -262 +259 @@
         }
 
+        // subtract fringe and update mask if fringe value is NAN
+        for (int iy = 0; iy < readout->image->numRows; iy++) {
+            for (int ix = 0; ix < readout->image->numCols; ix++) {
+                readout->image->data.F32[iy][ix] -= sumFringe->data.F32[iy][ix];
+                if (!isfinite(sumFringe->data.F32[iy][ix]) && readout->mask) {
+                    readout->mask->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] |= maskVal;
+                } 
+            }
+        }
+
         // XXX: Make generic, so subregions may be subtracted as well
-        if (!psBinaryOp(readout->image, readout->image, "-", sumFringe)) {
-            psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to subtract fringe.\n");
-            return false;
-        }
+        // if (!psBinaryOp(readout->image, readout->image, "-", sumFringe)) {
+        //     psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to subtract fringe.\n");
+        //     return false;
+        // }
 
         // measure residual fringe amplitude. results go to FRINGE.RESIDUALS