Changeset 11869

Timestamp:

Feb 16, 2007, 5:27:47 PM (19 years ago)

Author:

Paul Price

Message:

Changing sense of parity, so that all required concepts come from the source.

File:

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

trunk/psModules/src/camera/pmFPACopy.c

@@ -248 +248 @@
     if (xFlip) {
         int xZero = psMetadataLookupS32(NULL, source->concepts, "CELL.X0"); // CELL.X0 from source
-        int xParity = psMetadataLookupS32(NULL, target->concepts, "CELL.XPARITY"); // Parity in x
+        int xParity = psMetadataLookupS32(NULL, source->concepts, "CELL.XPARITY"); // Parity in x
         int xBin = psMetadataLookupS32(NULL, source->concepts, "CELL.XBIN"); // CELL.XBIN from source
         int xSize = psMetadataLookupS32(NULL, source->concepts, "CELL.XSIZE"); // CELL.XSIZE of source
 
         psTrace("psModules.camera", 3, "CELL.X0: Before: %d After: %d\n", xZero,
-                xZero - (xSize - 1) * xParity * xBin);
+                xZero + (xSize - 1) * xParity * xBin);
         psTrace("psModules.camera", 9, "(xParity: %d xBin: %d numCols: %d)\n", xParity, xBin, xSize);
 
@@ -261 +261 @@
         }
 
-        xZero -= (xSize - 1) * xParity * xBin; // Change the parity on the X0 position
+        xZero += (xSize - 1) * xParity * xBin; // Change the parity on the X0 position
         psMetadataItem *newItem = psMetadataLookup(target->concepts, "CELL.X0"); // CELL.X0 from target
         newItem->data.S32 = xZero;
@@ -267 +267 @@
     if (yFlip) {
         int yZero = psMetadataLookupS32(NULL, source->concepts, "CELL.Y0"); // CELL.Y0 from source
-        int yParity = psMetadataLookupS32(NULL, target->concepts, "CELL.YPARITY"); // Parity in y
+        int yParity = psMetadataLookupS32(NULL, source->concepts, "CELL.YPARITY"); // Parity in y
         int yBin = psMetadataLookupS32(NULL, source->concepts, "CELL.YBIN"); // Binning in y
         int ySize = psMetadataLookupS32(NULL, source->concepts, "CELL.YSIZE"); // CELL.YSIZE of source
 
         psTrace("psModules.camera", 3, "CELL.Y0: Before: %d After: %d\n", yZero,
-                yZero - (ySize - 1) * yParity * yBin);
+                yZero + (ySize - 1) * yParity * yBin);
         psTrace("psModules.camera", 9, "(yParity: %d yBin: %d numRows: %d)\n", yParity, yBin, ySize);
 
@@ -280 +280 @@
         }
 
-        yZero -= (ySize - 1) * yParity * yBin; // Change the parity on the Y0 position
+        yZero += (ySize - 1) * yParity * yBin; // Change the parity on the Y0 position
         psMetadataItem *newItem = psMetadataLookup(target->concepts, "CELL.Y0"); // CELL.Y0 from target
         newItem->data.S32 = yZero;