Changeset 15098

Timestamp:

Sep 28, 2007, 3:57:57 PM (19 years ago)

Author:

Paul Price

Message:

processChip wasn't putting the HDU in at the correct place. It's
dependent upon who calls it, so added additional parameter.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (5 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -398 +398 @@
                         pmFPA *fpa, // FPA of interest
                         pmChip *chip, // Chip of interest
+                        pmFPALevel level, // Level for HDU to go
                         pmHDU *hdu      // HDU to add
                         )
@@ -422 +423 @@
     }
 
-    if (!processContents(fpa, chip, hdu, PM_FPA_LEVEL_CELL, NULL, cellNames, cellTypes, format)) {
+    if (!processContents(fpa, chip, hdu, level, NULL, cellNames, cellTypes, format)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to set contents for chip from camera format.");
         psFree(cellNames);
@@ -561 +562 @@
         }
 
-        if (!processChip(format, chipContents, fpa, chip, hdu)) {
+        if (!processChip(format, chipContents, fpa, chip, PM_FPA_LEVEL_FPA, hdu)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to process chip %d\n", chipNum);
             psFree(hdu);
@@ -784 +785 @@
         hdu->format = psMemIncrRefCounter((const psPtr)format);
 
-        if (!processChip(format, contentItem->data.str, fpa, chip, hdu)) {
+        if (!processChip(format, contentItem->data.str, fpa, chip, PM_FPA_LEVEL_CELL, hdu)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to process chip\n");
             psFree(hdu);
@@ -874 +875 @@
     psFree(chipType);
 
-    if (!processChip(format, chipContents, fpa, chip, NULL)) {
+    if (!processChip(format, chipContents, fpa, chip, PM_FPA_LEVEL_NONE, NULL)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to process chip\n");
         return false;