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

Timestamp:

Jan 20, 2006, 6:33:38 PM (20 years ago)

Author:

Paul Price

Message:

Fixed up freeing an FPA hierarchy at lower levels (and retaining the upper level); fixed the weights to provide variance in DN

File:

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

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

@@ -132 +132 @@
 
 // Mosaic a chip together into a single image
-static bool mosaicChip(pmChip *chip,// Chip to mosaic
-                       int xBinChip, int yBinChip // Binning of mosaic image in x and y
-                      )
+int pmChipMosaic(pmChip *chip,// Chip to mosaic
+                 int xBinChip, int yBinChip // Binning of mosaic image in x and y
+                )
 {
 
@@ -149 +149 @@
 
     // Set up the required inputs
+    psTrace(__func__, 1, "Mosaicking %d cells...\n", cells->n);
     for (int i = 0; i < cells->n; i++) {
         pmCell *cell = cells->data[i];  // The cell of interest
         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]);
+        psTrace(__func__, 5, "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");
@@ -204 +205 @@
     psFree(weights);
     psFree(masks);
+    int nCells = cells->n;
+    psFree(cells);
 
     // Chop off all the component cells, and put in a new one
@@ -228 +231 @@
     //psFree(readout);
 
-    return true;
-}
-
-
-int pmFPAMosaicChips(pmFPA *fpa,        // FPA
+    return nCells;
+}
+
+
+int pmFPAMosaicCells(pmFPA *fpa,        // FPA
                      int xBinChip, int yBinChip // Binning of mosaic image in x and y
                     )
@@ -247 +250 @@
 
         numChips++;
-        mosaicChip(chip, xBinChip, yBinChip); // Mosaic of cells within the chip
+        pmChipMosaic(chip, xBinChip, yBinChip); // Mosaic of cells within the chip
 
     }