Changeset 26847 for branches/eam_branches/20091201/psModules

Timestamp:

Feb 10, 2010, 3:02:06 PM (16 years ago)

Author:

Paul Price

Message:

Implement chip mosaic for ppVizPattern. Pattern I/O is now correct: subtraction of the pattern from the pattern-subtracted image restores the original image.

Location:

branches/eam_branches/20091201/psModules/src/detrend

Files:

• pmPattern.c (modified) (4 diffs)
• pmPatternIO.c (modified) (9 diffs)

branches/eam_branches/20091201/psModules/src/detrend/pmPattern.c

@@ -87 +87 @@
 
     psImage *corr = psImageAlloc(order + 1, numRows, PS_TYPE_F64); // Corrections applied
+    psImageInit(corr, NAN);
 
     for (int y = 0; y < numRows; y++) {
@@ -113 +114 @@
         }
 
+        poly->coeff[0] -= background;
         memcpy(corr->data.F64[y], poly->coeff, (order + 1) * PSELEMTYPE_SIZEOF(PS_TYPE_F64));
-        corr->data.F64[y][0] -= background;
-
         psVector *solution = psPolynomial1DEvalVector(poly, indices); // Solution vector
         if (!solution) {
@@ -125 +125 @@
 
         for (int x = 0; x < numCols; x++) {
-            image->data.F32[y][x] += (background - solution->data.F32[x]);
+            image->data.F32[y][x] -= solution->data.F32[x];
         }
         psFree(solution);
@@ -174 +174 @@
 
     for (int y = 0; y < numRows; y++) {
-        memcpy(poly->coeff, corr->data.F64[y], order * PSELEMTYPE_SIZEOF(PS_TYPE_F64));
+        memcpy(poly->coeff, corr->data.F64[y], (order + 1) * PSELEMTYPE_SIZEOF(PS_TYPE_F64));
         psVector *solution = psPolynomial1DEvalVector(poly, indices); // Solution vector
         if (!solution) {

branches/eam_branches/20091201/psModules/src/detrend/pmPatternIO.c

@@ -9 +9 @@
 #include "pmFPAfile.h"
 #include "pmFPAfileFitsIO.h"
+#include "pmFPAHeader.h"
 #include "pmConceptsRead.h"
+#include "pmConceptsWrite.h"
 
 #include "pmPattern.h"
@@ -24 +26 @@
     psImage *rowCorr = psMetadataLookupPtr(&gotRow, ro->analysis, PM_PATTERN_ROW_CORRECTION); // Row correction
     float cellCorr = psMetadataLookupF32(&gotCell, ro->analysis, PM_PATTERN_CELL_CORRECTION); // Cell corr.
-    if (!gotRow && !gotCell) {
-        // Nothing to write
-        return true;
-    }
 
     pmCell *cell = ro->parent;          // Cell of interest
@@ -73 +71 @@
     PS_ASSERT_PTR_NON_NULL(cell->readouts, false);
     PS_ASSERT_PTR_NON_NULL(view, false);
+
+    if (!pmConceptsWriteCell(cell, true, config)) {
+        psError(PS_ERR_IO, false, "Unable to write concepts for cell.");
+        return false;
+    }
 
     pmFPAview *thisView = pmFPAviewAlloc(view->nRows); // Copy of input view
@@ -97 +100 @@
     PS_ASSERT_PTR_NON_NULL(view, false);
 
+    if (!pmConceptsWriteChip(chip, true, true, config)) {
+        psError(PS_ERR_IO, false, "Unable to write concepts for chip.\n");
+        return false;
+    }
+
     pmFPAview *thisView = pmFPAviewAlloc(view->nRows); // Copy of input view
     *thisView = *view;
@@ -120 +128 @@
     PS_ASSERT_PTR_NON_NULL(fpa->chips, false);
 
+    if (!pmConceptsWriteFPA(fpa, true, config)) {
+        psError(PS_ERR_IO, false, "Unable to write concepts for FPA.\n");
+        return false;
+    }
+
     pmFPAview *thisView = pmFPAviewAlloc(view->nRows); // Copy of input view
     *thisView = *view;
@@ -168 +181 @@
     }
 
-    bool data = false;                  // Did we find any data?
+    bool data = true;                  // Did we find any data?
 
     psMetadataItem *cellCorr = psMetadataLookup(header, PM_PATTERN_CELL_CORRECTION); // Cell pattern correction
@@ -216 +229 @@
         pmReadout *readout = cell->readouts->data[i];
         thisView->readout = i;
-        pmReadoutReadPattern(readout, file->fits);
-        if (!readout->data_exists) {
-            continue;
-        }
-#if 0
-        // load in the concept information for this cell
-        if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
-            psErrorClear();
-            psWarning("Difficulty reading concepts for cell; attempting to proceed.");
-        }
-#endif
-        cell->data_exists = true;
-    }
-    psFree(thisView);
+        if (!pmReadoutReadPattern(readout, file->fits)) {
+            psError(PS_ERR_IO, false, "Unable to read pattern correction.");
+            return false;
+        }
+    }
+    psFree(thisView);
+
+    if (!pmCellReadHeader(cell, file->fits, config)) {
+        psError(PS_ERR_IO, false, "Unable to read header for cell.");
+        return false;
+    }
+    // load in the concept information for this cell
+    if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
+        psErrorClear();
+        psWarning("Difficulty reading concepts for cell; attempting to proceed.");
+    }
 
     return true;
@@ -256 +271 @@
     psFree(thisView);
 
-#if 0
+    if (!pmChipReadHeader(chip, file->fits, config)) {
+        psError(PS_ERR_IO, false, "Unable to read header for cell.");
+        return false;
+    }
     if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, true, NULL)) {
         psError(PS_ERR_IO, false, "Failed to read concepts for chip.\n");
         return false;
     }
-#endif
 
     return true;
@@ -284 +301 @@
     psFree(thisView);
 
-#if 0
+    if (!pmFPAReadHeader(fpa, file->fits, config)) {
+        psError(PS_ERR_IO, false, "Unable to read header for cell.");
+        return false;
+    }
     if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, true, NULL)) {
         psError(PS_ERR_IO, false, "Failed to read concepts for fpa.\n");
         return false;
     }
-#endif
 
     return true;