Changeset 11865

Timestamp:

Feb 16, 2007, 4:36:38 PM (19 years ago)

Author:

Paul Price

Message:

pmFPACopy was using a readout to give the size of a cell (when flipping the parity), so that if the readout wasn't present it would SEGV. Added new concepts CELL.XSIZE, CELL.YSIZE, CHIP.XSIZE, CHIP.YSIZE for the size of the various components.

Location:

trunk/psModules/src

Files:

• camera/pmFPACopy.c (modified) (3 diffs)
• concepts/pmConcepts.c (modified) (2 diffs)
• concepts/pmConceptsRead.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPACopy.c

@@ -250 +250 @@
         int xParity = psMetadataLookupS32(NULL, target->concepts, "CELL.XPARITY"); // Parity in x
         int xBin = psMetadataLookupS32(NULL, source->concepts, "CELL.XBIN"); // CELL.XBIN from source
-        pmReadout *readout = source->readouts->data[0]; // A representative readout
+        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 - (readout->image->numCols - 1) * xParity * xBin);
-        psTrace("psModules.camera", 9, "(xParity: %d xBin: %d numCols: %d)\n",
-                xParity, xBin, readout->image->numCols);
-        xZero -= (readout->image->numCols - 1) * xParity * xBin; // Change the parity on the X0 position
+                xZero - (xSize - 1) * xParity * xBin);
+        psTrace("psModules.camera", 9, "(xParity: %d xBin: %d numCols: %d)\n", xParity, xBin, xSize);
+
+        if (xParity == 0 || xBin == 0 || xSize == 0) {
+            psWarning("New CELL.X0 may be incorrect due to missing concepts "
+                      "(CELL.X0, CELL.XPARITY, CELL.XBIN, CELL.XSIZE)");
+        }
+
+        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;
@@ -262 +268 @@
         int yZero = psMetadataLookupS32(NULL, source->concepts, "CELL.Y0"); // CELL.Y0 from source
         int yParity = psMetadataLookupS32(NULL, target->concepts, "CELL.YPARITY"); // Parity in y
-        int yBin = psMetadataLookupS32(NULL, source->concepts, "CELL.YBIN"); // Parity in y
-        pmReadout *readout = source->readouts->data[0]; // A representative readout
+        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 - (readout->image->numRows - 1) * yParity * yBin);
-        psTrace("psModules.camera", 9, "(yParity: %d yBin: %d numRows: %d)\n",
-                yParity, yBin, readout->image->numRows);
-        yZero -= (readout->image->numRows - 1) * yParity * yBin; // Change the parity on the Y0 position
+                yZero - (ySize - 1) * yParity * yBin);
+        psTrace("psModules.camera", 9, "(yParity: %d yBin: %d numRows: %d)\n", yParity, yBin, ySize);
+
+        if (yParity == 0 || yBin == 0 || ySize == 0) {
+            psWarning("New CELL.Y0 may be incorrect due to missing concepts "
+                      "(CELL.Y0, CELL.YPARITY, CELL.YBIN, CELL.YSIZE)");
+        }
+
+        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;
@@ -297 +309 @@
             targetPHU->header = psMetadataAlloc();
         }
-        //        pmHDU *sourcePHU = pmHDUGetHighest(source->parent->parent, source->parent, source); // A source HDU
+//        pmHDU *sourcePHU = pmHDUGetHighest(source->parent->parent, source->parent, source); // A source HDU
         pmHDU *sourcePHU = findBlankPHU(source); // The target PHU
         if (sourcePHU && sourcePHU->header) {

trunk/psModules/src/concepts/pmConcepts.c

@@ -639 +639 @@
         }
 
+        // CHIP.XSIZE
+        {
+            psMetadataItem *chipXsize = psMetadataItemAllocS32("CHIP.XSIZE", "Size of chip (pixels)", 0);
+            pmConceptRegister(chipXsize, NULL, NULL, PM_FPA_LEVEL_CHIP);
+            psFree(chipXsize);
+        }
+
+        // CHIP.YSIZE
+        {
+            psMetadataItem *chipYsize = psMetadataItemAllocS32("CHIP.YSIZE", "Size of chip (pixels)", 0);
+            pmConceptRegister(chipYsize, NULL, NULL, PM_FPA_LEVEL_CHIP);
+            psFree(chipYsize);
+        }
+
         // CHIP.TEMP
         {
@@ -808 +822 @@
         }
 
+        // CELL.XSIZE
+        {
+            psMetadataItem *cellXsize = psMetadataItemAllocS32("CELL.XSIZE", "Size of cell (pixels)", 0);
+            pmConceptRegister(cellXsize, NULL, NULL, PM_FPA_LEVEL_CELL);
+            psFree(cellXsize);
+        }
+
+        // CELL.YSIZE
+        {
+            psMetadataItem *cellYsize = psMetadataItemAllocS32("CELL.YSIZE", "Size of cell (pixels)", 0);
+            pmConceptRegister(cellYsize, NULL, NULL, PM_FPA_LEVEL_CELL);
+            psFree(cellYsize);
+        }
     }
 

trunk/psModules/src/concepts/pmConceptsRead.c

@@ -48 +48 @@
     }
 }
-
 
 // Parse a single concept