Changeset 6062 for branches/eam_rel9_p0/psModules/src/astrom/pmChipMosaic.c

Timestamp:

Jan 19, 2006, 4:38:28 PM (21 years ago)

Author:

Paul Price

Message:

Getting a working ppImage

File:

• branches/eam_rel9_p0/psModules/src/astrom/pmChipMosaic.c (modified) (8 diffs)

branches/eam_rel9_p0/psModules/src/astrom/pmChipMosaic.c

@@ -3 +3 @@
 
 #include "pslib.h"
-#include "pmAstrometry.h"
+#include "pmFPA.h"
 #include "pmChipMosaic.h"
 
@@ -34 +34 @@
     // Get the maximum extent of the mosaic image
     int xMin = INT_MAX;
-    int xMax = 0;
+    int xMax = - INT_MAX;
     int yMin = INT_MAX;
-    int yMax = 0;
+    int yMax = - INT_MAX;
     for (int i = 0; i < source->n; i++) {
         psImage *image = source->data[i]; // The image of interest
+        if (!image) {
+            continue;
+        }
 
         assert(image->type.type == PS_TYPE_F32); // Only implemented for F32 images so far.
@@ -74 +77 @@
     for (int i = 0; i < source->n; i++) {
         psImage *image = source->data[i]; // The image of interest
+        if (!image) {
+            continue;
+        }
         if (xBinSource->data.S32[i] == xBinTarget && yBinSource->data.S32[i] == yBinTarget &&
                 xFlip->data.U8[i] == 0 && yFlip->data.U8[i] == 0) {
@@ -107 +113 @@
 
 // Mosaic a chip together into a single image
-static psImage *mosaicChip(pmChip *chip,// Chip to mosaic
-                           int xBinChip, int yBinChip // Binning of mosaic image in x and y
-                          )
+static bool mosaicChip(pmChip *chip,// Chip to mosaic
+                       int xBinChip, int yBinChip // Binning of mosaic image in x and y
+                      )
 {
 
     psArray *cells = chip->cells;       // The array of cells
     psArray *images = psArrayAlloc(cells->n); // Array of images that will be mosaicked
+    psArray *weights = psArrayAlloc(cells->n); // Array of weight images to be mosaicked
+    psArray *masks = psArrayAlloc(cells->n); // Array of mask images to be mosaicked
     psVector *x0 = psVectorAlloc(cells->n, PS_TYPE_S32); // Origin x coordinates
     psVector *y0 = psVectorAlloc(cells->n, PS_TYPE_S32); // Origin y coordinates
@@ -126 +134 @@
         x0->data.S32[i] = psMetadataLookupS32(NULL, cell->concepts, "CELL.X0");
         y0->data.S32[i] = psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0");
+        psTrace(__func__, 9, "Cell %d: x0=%d y0=%d\n", i, x0->data.S32[i], y0->data.S32[i]);
         xBin->data.S32[i] = psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN");
         yBin->data.S32[i] = psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN");
@@ -159 +168 @@
         }
         psImage *image = ((pmReadout*)readouts->data[0])->image; // The image to put into the mosaic
+        psImage *weight = ((pmReadout*)readouts->data[0])->weight;
+        psImage *mask = ((pmReadout*)readouts->data[0])->weight;
         images->data[i] = psImageSubset(image, *trimsec); // Trimmed image
-    }
-
+        weights->data[i] = weight ? psImageSubset(weight, *trimsec) : NULL;
+        masks->data[i] = mask ? psImageSubset(mask, *trimsec) : NULL;
+    }
     // Mosaic the images together and we're done
-    psImage *mosaic = p_pmImageMosaic(images, xFlip, yFlip, xBin, yBin, xBinChip, yBinChip, x0, y0);
+    psImage *image = p_pmImageMosaic(images, xFlip, yFlip, xBin, yBin, xBinChip, yBinChip, x0, y0);
+    psImage *weight = p_pmImageMosaic(weights, xFlip, yFlip, xBin, yBin, xBinChip, yBinChip, x0, y0);
+    psImage *mask = p_pmImageMosaic(masks, xFlip, yFlip, xBin, yBin, xBinChip, yBinChip, x0, y0);
 
     // Clean up
@@ -173 +187 @@
     psFree(yFlip);
     psFree(images);
-
-    return mosaic;
+    psFree(weights);
+    psFree(masks);
+
+    // Chop off all the component cells, and put in a new one
+
+    #if 1
+    // XXX For the sake of getting something working, I am not going to bother with sorting out where
+    // the double free is coming from.  I'm going to drop the pointers on the array and create a memory
+    // leak.  We can clean this up later, when we're not under as much pressure.
+    chip->cells = psArrayAlloc(0);
+    #else
+
+    psArrayElementsFree(chip->cells);
+    chip->cells = psArrayRealloc(chip->cells, 0);
+    chip->cells->n = 0;
+    #endif
+
+    pmCell *cell = pmCellAlloc(chip, NULL, __func__); // New cell
+    cell->exists = true;
+    cell->process = true;
+    pmReadout *readout = pmReadoutAlloc(cell); // New readout
+    readout->image = image;
+    readout->weight = weight;
+    readout->mask = mask;
+    //psFree(readout);
+
+    return true;
 }
 
@@ -193 +232 @@
 
         numChips++;
-        psImage *mosaic = mosaicChip(chip, xBinChip, yBinChip); // Mosaic of cells within the chip
-
-        // Chop off all the component cells, and put in a new one
-        psArrayElementsFree(chip->cells);
-        chip->cells = psArrayRealloc(chip->cells, 1);
-        pmCell *cell = pmCellAlloc(chip, NULL, __func__); // New cell
-        pmReadout *readout = pmReadoutAlloc(cell); // New readout
-        readout->image = mosaic;
-        psFree(readout);
+        mosaicChip(chip, xBinChip, yBinChip); // Mosaic of cells within the chip
+
     }