Changeset 28334 for branches/czw_branch/20100519/ppBackground/src/ppBackgroundLoop.c

Timestamp:

Jun 15, 2010, 11:22:56 AM (16 years ago)

Author:

watersc1

Message:

association and jpegs look fine. random simtest errors are a bit worrying, though.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ppBackground (modified) (1 prop)
• ppBackground/src (modified) (1 prop)
• ppBackground/src/ppBackgroundLoop.c (modified) (9 diffs)

branches/czw_branch/20100519/ppBackground/src/ppBackgroundLoop.c

@@ -6 +6 @@
 #include <pslib.h>
 #include <psmodules.h>
+#include <ppStats.h>
 
 #include "ppBackground.h"
@@ -13 +14 @@
 {
     pmConfig *config = data->config;                                        // Configuration data
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPBACKGROUND.BACKGROUND", 0);
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPBACKGROUND.IMAGE", 0);
     pmFPAfile *patternFile = pmFPAfileSelectSingle(config->files, "PPBACKGROUND.PATTERN", 0); // File with data
+    pmFPAfile *bgFile = pmFPAfileSelectSingle(config->files, "PPBACKGROUND.BACKGROUND", 0);   // File with bg
     pmFPA *patternMosaic = pmFPAConstruct(file->camera, file->cameraName); // Mosaicked FPA for pattern
 
-    psImageMaskType maskBad = pmConfigMaskGet("BLANK", config); // Mask value to set
+    psImageMaskType maskBad = pmConfigMaskGet("DETECTOR", config); // Mask value to set
 
     pmFPAview *view = pmFPAviewAlloc(0); // Pointer into FPA hierarchy
@@ -34 +36 @@
         }
 
-        if (chip->cell->n > 1) {
+        if (chip->cells->n > 1) {
             psError(PPBACKGROUND_ERR_CONFIG, true,
                     "Input image and background model should be chip-mosaicked");
@@ -44 +46 @@
             pmFPAfileActivate(config->files, true, "PPBACKGROUND.PATTERN");
 
-            pmCell *cell;               // Cell with pattern data
+            pmCell *patternCell;               // Cell with pattern data
             while ((patternCell = pmFPAviewNextCell(view, patternFile->fpa, 1))) {
-                if (!cell->process || !cell->file_exists) {
+                if (!patternCell->process || !patternCell->file_exists) {
                     continue;
                 }
@@ -68 +70 @@
                     // Get size of image from concepts
                     if (numCols == 0 || numRows == 0) {
-                        numCols = psMetadataLookupS32(NULL, cell->concepts, "CELL.XSIZE");
-                        numRows = psMetadataLookupS32(NULL, cell->concepts, "CELL.YSIZE");
+                        numCols = psMetadataLookupS32(NULL, patternCell->concepts, "CELL.XSIZE");
+                        numRows = psMetadataLookupS32(NULL, patternCell->concepts, "CELL.YSIZE");
                     }
                     // Get size of image from TRIMSEC
                     if (numCols == 0 || numRows == 0) {
-                        psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC");
+                        psRegion *trimsec = psMetadataLookupPtr(NULL, patternCell->concepts, "CELL.TRIMSEC");
                         numCols = trimsec->x1 - trimsec->x0;
                         numRows = trimsec->y1 - trimsec->y0;
@@ -84 +86 @@
                     readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
                     psImageInit(readout->image, 0.0);
+                    readout->mask = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK);
+                    psImageInit(readout->mask, 0);
 
                     if (!pmPatternRowApply(readout, maskBad) || !pmPatternCellApply(readout, maskBad)) {
@@ -91 +95 @@
 
                     // Remove bias sections to avoid warnings
-                    psMetadataItem *biassec = psMetadataLookup(patternRO->parent->concepts, "CELL.BIASSEC");
+                    psMetadataItem *biassec = psMetadataLookup(patternCell->concepts, "CELL.BIASSEC");
                     if (psListLength(biassec->data.V)) {
                         psFree(biassec->data.V);
@@ -114 +118 @@
             }
 
-            pmChip *mosaic = pmFPAviewThisChip(view, patternMosaic); // Chip for mosaicked pattern
-            if (!pmChipMosaic(mosaic, chip, true, maskBad)) {
-                psError(psErrorCodeLast(), false, "Unable to mosaic pattern correction");
-                return false;
+            if (data->patternName) {
+                pmChip *patternChip = pmFPAviewThisChip(view, patternFile->fpa); // Chip for pattern
+                pmChip *mosaic = pmFPAviewThisChip(view, patternMosaic); // Chip for mosaicked pattern
+                if (!mosaic->hdu && !mosaic->parent->hdu) {
+                    pmFPAAddSourceFromView(patternMosaic, view, file->format);
+                }
+                if (!pmChipMosaic(mosaic, patternChip, true, maskBad)) {
+                    psError(psErrorCodeLast(), false, "Unable to mosaic pattern correction");
+                    return false;
+                }
+                pmFPAfileActivate(config->files, true, NULL);
+            //            pmFPAfileActivate(config->files, false, "PPBACKGROUND.PATTERN");
             }
-            pmFPAfileActivate(config->files, true, NULL);
-            pmFPAfileActivate(config->files, false, "PPBACKGROUND.PATTERN");
         }
 
+        pmChip *patternChip = patternFile ? pmFPAviewThisChip(view, patternMosaic) : NULL; // Chip with pattern
+        pmChip *bgChip = bgFile ? pmFPAviewThisChip(view, bgFile->fpa) : NULL; // Chip with background model
+        if (!ppBackgroundRestore(chip, bgChip, patternChip, view, config)) {
+            psError(psErrorCodeLast(), false, "Unable to replace background");
+            return false;
+        }
+        pmChipFreeData(patternChip);
 
-
-
-
-
-
-                pmHDU *hdu = pmHDUGetLowest(file->fpa, chip, cell); // HDU for readout
-                if (!hdu) {
-                    psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find HDU for data.");
-                    return false;
-                }
-                if (!hdu->header) {
-                    hdu->header = psMetadataAlloc();
-                }
-                ppBackgroundVersionHeader(hdu->header);
-
-
-
-
-
-
-
+        pmHDU *hdu = pmHDUGetLowest(file->fpa, chip, NULL); // HDU for chip
+        if (!hdu) {
+            psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find HDU for data.");
+            return false;
+        }
+        if (!hdu->header) {
+            hdu->header = psMetadataAlloc();
+        }
+        ppBackgroundVersionHeader(hdu->header);
 
         // Chip
@@ -158 +163 @@
     }
 
+    psFree(patternMosaic);
+
+    if (data->stats) {
+        psImageMaskType maskVal = 0;    // Bits to mask
+        if (!pmConfigMaskSetBits(&maskVal, NULL, config)) {
+            psError(psErrorCodeLast(), false, "Unable to find bits to mask");
+            return false;
+        }
+        ppStatsFPA(data->stats, file->fpa, view, maskVal, config);
+    }
+
+    psFree(view);
+
     return true;
 }