Changeset 16424

Timestamp:

Feb 13, 2008, 2:14:04 PM (18 years ago)

Author:

Paul Price

Message:

Attempting to support stacking of images when they are read piecemeal (scan by scan). Need to specify size of the (original) image, so that normalisation can be done (during convolution) when the image size is not the original image size. Doing some algebraic gymnastics in the pixel rejection to account for the image being smaller than the original.

Location:

branches/pap_branch_080207/ppStack/src

Files:

• ppStackMatch.c (modified) (1 diff)
• ppStackReadout.c (modified) (1 diff)

branches/pap_branch_080207/ppStack/src/ppStackMatch.c

@@ -141 +141 @@
         while ((item = psMetadataGetAndIncrement(iter))) {
             assert(item->type == PS_DATA_UNKNOWN);
-            *kernels = psArrayAdd(*kernels, ARRAY_BUFFER, item->data.V);
+            // Set the normalisation dimensions, since these will be otherwise unavailable when reading the
+            // images by scans.
+            pmSubtractionKernels *kernel = item->data.V; // Kernel used in subtraction
+            kernel->numCols = readout->image->numCols;
+            kernel->numRows = readout->image->numRows;
+
+            *kernels = psArrayAdd(*kernels, ARRAY_BUFFER, kernel);
         }
         psFree(iter);

branches/pap_branch_080207/ppStack/src/ppStackReadout.c

@@ -137 +137 @@
     for (int i = 0; i < num; i++) {
         pmStackData *data = stack->data[i]; // Data for this image
-        psPixels *reject = pmStackReject(data->pixels, threshold, regions->data[i],
+        pmReadout *readout = data->readout; // Readout of interest
+        int col0 = readout->col0, row0 = readout->row0; // Offset for readout
+        int numCols = readout->image->numCols, numRows = readout->image->numRows; // Size of image
+
+        psRegion *valid = psRegionAlloc(col0, col0 + numCols, row0, row0 + numRows); // Valid region for rej
+        psPixels *reject = pmStackReject(data->pixels, valid, threshold, regions->data[i],
                                          kernels->data[i]); // Pixels to reject
+        psFree(valid);
         psFree(data->pixels);
         data->pixels = reject;