Changeset 12654 for trunk/psModules/src/camera/pmFPAMosaic.c

Timestamp:

Mar 28, 2007, 1:45:31 PM (19 years ago)

Author:

Paul Price

Message:

Distinguishing between mosaicking (different cells within the same chip) and stacking (same cells within different chips) for concept averaging.

File:

• trunk/psModules/src/camera/pmFPAMosaic.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -510 +510 @@
         int yTargetBase = (y0->data.S32[i] - yMin) / yBinTarget; // The base y position in the target frame
 
-        // in the first case, we are just copy a section pixel-by-pixel
-        if ((xBinSource->data.S32[i] == xBinTarget) && 
-            (yBinSource->data.S32[i] == yBinTarget) && 
-            (xFlip->data.U8[i] == 0) && 
-            (yFlip->data.U8[i] == 0)) {
+        // in the first case, we are just copy a section pixel-by-pixel
+        if ((xBinSource->data.S32[i] == xBinTarget) &&
+            (yBinSource->data.S32[i] == yBinTarget) &&
+            (xFlip->data.U8[i] == 0) &&
+            (yFlip->data.U8[i] == 0)) {
             // Let someone else do the hard work
             psImageOverlaySection(mosaic, image, xTargetBase, yTargetBase, "+");
-            continue;
-        } 
-        
-        // in the second case, there's a difference with the parities, but we don't have to
-        // worry about binning
-        if (xBinSource->data.S32[i] == xBinTarget && yBinSource->data.S32[i] == yBinTarget) {
+            continue;
+        }
+
+        // in the second case, there's a difference with the parities, but we don't have to
+        // worry about binning
+        if (xBinSource->data.S32[i] == xBinTarget && yBinSource->data.S32[i] == yBinTarget) {
             switch (type) {
                 COPY_WITH_PARITY_DIFFERENCE(F32);
                 COPY_WITH_PARITY_DIFFERENCE(U8);
-              default:
+              default:
                 psAbort("Should never get here.\n");
             }
-            continue;
-        } 
-        
-        // In the third case, the images are flipped and have different binnnig.
-        // We have to do all of the hard work ourselves
-        switch (type) {
-            FILL_IN(F32);
-            FILL_IN(U8);
-          default:
-            psAbort("Should never get here.\n");
-        }
+            continue;
+        }
+
+        // In the third case, the images are flipped and have different binnnig.
+        // We have to do all of the hard work ourselves
+        switch (type) {
+            FILL_IN(F32);
+            FILL_IN(U8);
+          default:
+            psAbort("Should never get here.\n");
+        }
     } // Iterating over images
 
@@ -1048 +1048 @@
         }
         chipRegion = psRegionAlloc(0, 0, 0, 0); // We've cut and paste, so there's no valid trimsec
-        *chipRegion = psRegionForImage (mosaicImage, *chipRegion);
+        *chipRegion = psRegionForImage (mosaicImage, *chipRegion);
     }
     psTrace("psModules.camera", 1, "xBin,yBin: %d,%d\n", xBin, yBin);
@@ -1054 +1054 @@
     // Set the concepts for the target cell
     psList *sourceCells = psArrayToList(source->cells); // List of cells
-    pmConceptsAverageCells(targetCell, sourceCells, chipRegion, NULL);
+    pmConceptsAverageCells(targetCell, sourceCells, chipRegion, NULL, false);
     {
         psMetadataItem *item = psMetadataLookup(targetCell->concepts, "CELL.X0");
@@ -1182 +1182 @@
         }
     }
-    pmConceptsAverageCells(targetCell, sourceCells, fpaRegion, NULL);
+    pmConceptsAverageCells(targetCell, sourceCells, fpaRegion, NULL, false);
     {
         psMetadataItem *item = psMetadataLookup(targetCell->concepts, "CELL.X0");