Changeset 6804 for branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c

Timestamp:

Apr 5, 2006, 2:28:28 PM (20 years ago)

Author:

Paul Price

Message:

Reworking pmFPAAddSource for better code maintainance, and to implement PHU=FPA,EXT=NONE

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c (modified) (3 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPACopy.c

@@ -470 +470 @@
     bool yFlip = (psMetadataLookupS32(NULL, target->concepts, "CELL.YPARITY") !=
                   psMetadataLookupS32(NULL, source->concepts, "CELL.YPARITY")); // Switch parity in y?
+    psTrace(__func__, 3, "xFlip: %d; yFlip: %d\n", xFlip, yFlip);
 
     bool mdok = true;                   // Status of MD lookup
@@ -535 +536 @@
         psString name = conceptItem->name; // Name of concept
         if (strcmp(name, "CELL.TRIMSEC") != 0 && strcmp(name, "CELL.BIASSEC") != 0 &&
-                strcmp(name, "CELL.XPARITY") != 0 && strcmp(name, "CELL.YPARITY") != 0) {
+                strcmp(name, "CELL.XPARITY") != 0 && strcmp(name, "CELL.YPARITY") != 0 &&
+                strcmp(name, "CELL.X0") != 0 && strcmp(name, "CELL.Y0") != 0) {
             psMetadataAddItem(target->concepts, conceptItem, PS_LIST_TAIL, PS_META_REPLACE);
         }
@@ -543 +545 @@
     // Need to update CELL.X0 and CELL.Y0 if we flipped
     if (xFlip) {
-        psMetadataItem *xZero = psMetadataLookup(target->concepts, "CELL.X0"); // CELL.X0
+        int xZero = psMetadataLookupS32(NULL, source->concepts, "CELL.X0"); // CELL.X0 from source
+        int xParity = psMetadataLookupS32(NULL, target->concepts, "CELL.XPARITY"); // Parity in x
         pmReadout *readout = target->readouts->data[0]; // A representative readout
-        xZero->data.S32 -= readout->image->numCols - 1;
+        psTrace(__func__, 3, "CELL.X0: Before: %d After: %d\n", xZero,
+                xZero - (readout->image->numCols - 1) * xParity);
+        xZero -= (readout->image->numCols - 1) * xParity; // Change the parity on the X0 position
+        psMetadataItem *newItem = psMetadataLookup(target->concepts, "CELL.X0"); // CELL.X0 from target
+        newItem->data.S32 = xZero;
     }
     if (yFlip) {
-        psMetadataItem *yZero = psMetadataLookup(target->concepts, "CELL.Y0"); // CELL.Y0
+        int yZero = psMetadataLookupS32(NULL, source->concepts, "CELL.Y0"); // CELL.Y0 from source
+        int yParity = psMetadataLookupS32(NULL, target->concepts, "CELL.YPARITY"); // Parity in y
         pmReadout *readout = target->readouts->data[0]; // A representative readout
-        yZero->data.S32 -= readout->image->numRows - 1;
+        psTrace(__func__, 3, "CELL.Y0: Before: %d After: %d\n", yZero,
+                yZero - (readout->image->numCols - 1) * yParity);
+        yZero -= (readout->image->numCols - 1) * yParity; // Change the parity on the Y0 position
+        psMetadataItem *newItem = psMetadataLookup(target->concepts, "CELL.Y0"); // CELL.Y0 from target
+        newItem->data.S32 = yZero;
     }