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

Timestamp:

Jan 19, 2006, 11:47:06 PM (21 years ago)

Author:

Paul Price

Message:

Readouts now contain a subimage

File:

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

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

@@ -37 +37 @@
     int yMin = INT_MAX;
     int yMax = - INT_MAX;
+    psElemType type = 0;
     for (int i = 0; i < source->n; i++) {
         psImage *image = source->data[i]; // The image of interest
@@ -43 +44 @@
         }
 
-        assert(image->type.type == PS_TYPE_F32); // Only implemented for F32 images so far.
+        // Only implemented for F32 and U8 images so far.
+        assert(image->type.type == PS_TYPE_F32 || image->type.type == PS_TYPE_U8);
+        // All input types must be the same
+        if (type == 0) {
+            type = image->type.type;
+        }
+        assert(type == image->type.type);
 
         // Size of cell in x and y
@@ -71 +78 @@
 
     psTrace(__func__, 3, "Spliced image will be %dx%d\n", (int)xSize, (int)ySize);
-    psImage *mosaic = psImageAlloc((int)xSize, (int)ySize, PS_TYPE_F32); // The mosaic image
+    psImage *mosaic = psImageAlloc((int)xSize, (int)ySize, type); // The mosaic image
     psImageInit(mosaic, 0.0);
 
@@ -96 +103 @@
                     // In case the original image is binned but the mosaic is not, we need to fill in the
                     // values in the mosaic.
-                    for (int j = 0; j < yBinSource->data.S32[i]; j++) {
-                        int yTarget = (int)(yTargetBase + yParity * (float)j / (float)yBinTarget);
-                        for (int i = 0; i < xBinSource->data.S32[i]; i++) {
-                            int xTarget = (int)(xTargetBase + xParity * (float)i / (float)xBinTarget);
-
-                            mosaic->data.F32[yTarget][xTarget] += image->data.F32[y][x];
-                        }
-                    } // Iterating over mosaic image for binned input image
+                    #define FILL_IN(TYPE)                                                                    \
+                    for (int j = 0; j < yBinSource->data.S32[i]; j++) {                                      \
+                        int yTarget = (int)(yTargetBase + yParity * (float)j / (float)yBinTarget);           \
+                        for (int i = 0; i < xBinSource->data.S32[i]; i++) {                                  \
+                            int xTarget = (int)(xTargetBase + xParity * (float)i / (float)xBinTarget);       \
+                            mosaic->data.TYPE[yTarget][xTarget] += image->data.TYPE[y][x];                   \
+                        }                                                                                    \
+                    }
+
+                    switch (type) {
+                    case PS_TYPE_F32:
+                        FILL_IN(F32);
+                        break;
+                    case PS_TYPE_U8:
+                        FILL_IN(U8);
+                        break;
+                    default:
+                        psAbort(__func__, "Should never get here.\n");
+                    }
+
                 }
             } // Iterating over input image
@@ -158 +177 @@
         }
 
-        // Trim the image to get rid of the overscan
-        psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC");
-        psTrace(__func__, 7, "Cell %d trimsec: [%.0f:%.0f,%.0f:%.0f]\n", i, trimsec->x0, trimsec->x1,
-                trimsec->y0, trimsec->y1);
         psArray *readouts = cell->readouts; // The array of readouts
         if (readouts->n > 1) {
@@ -167 +182 @@
                      "be mosaicked.\n", i);
         }
-        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;
+        pmReadout *readout = readouts->data[0]; // The only readout we'll bother with
+
+        // The images to put into the mosaic
+        images->data[i]  = readout->image;
+        weights->data[i] = readout->weight;
+        masks->data[i]   = readout->mask;
     }
     // Mosaic the images together and we're done