Changeset 12564 for trunk/psModules/src/camera/pmFPARead.c

Timestamp:

Mar 22, 2007, 5:09:53 PM (19 years ago)

Author:

Paul Price

Message:

When we went to process TC3 images, we found that our camera formats
didn't handle its case (PHU=CHIP, EXT=CELL) properly. In order to
accomodate it, I've reworked the camera formats (including adding a
source to an FPA, and generating mosaic camera configurations). Now,
the particular format of the camera format file is *very* dependent
upon the FITS file:

Case PHU EXTENSIONS Description

1. FPA CHIP CONTENTS(METADATA) has a list of extensions, each with a chip type.

CHIPS(METADATA) has a list of chip types, each with cell:type

2. FPA CELL CONTENTS(METADATA) has a list of extensions, each with chip:cell:type

No need for CHIPS.

3. FPA NONE CONTENTS(STRING) has a list of extensions, chip:cell:type

No need for CHIPS

4. CHIP CELL CONTENTS(METADATA) is a menu, each with a chip type

CHIPS(METADATA) has a list of chip types(METADATA), containg a list of
extensions.

5. CHIP NONE CONTENTS(METADATA) is a menu, each with a chip type

CHIPS(METADATA) has a list of chip types(STRING) with cell:type

6. CELL NONE CONTENTS(METADATA) is a menu, each with a cell type.

No need for CHIPS.

Debugged and plugged memory leaks for this fix. Now able to
successfully read TC3 and Megacam (all 3 formats). Can't run ppImage
with PPIMAGE_N on file with PHU=CHIP because it's trying to write out
a PHU (at the FPA level) before it reads any of the input data. This
behaviour exists in a previous version (IPP 1.0; in fact, the current
fix deals with it a bit better --- error instead of SEGV), so it
should be safe to use this now.

File:

• trunk/psModules/src/camera/pmFPARead.c (modified) (6 diffs)

trunk/psModules/src/camera/pmFPARead.c

@@ -39 +39 @@
                          const psRegion *trimsec, // Trim section
                          const psList *biassecs, // Bias sections
-                         fpaReadType type
+                         fpaReadType type
                         )
 {
@@ -65 +65 @@
     switch (type) {
       case FPA_READ_TYPE_IMAGE:
-        if (readout->image) {
-            psFree (readout->image);
-        }
-        readout->image = psMemIncrRefCounter(psImageSubset(image, region));     
-        break;
+        if (readout->image) {
+            psFree (readout->image);
+        }
+        readout->image = psMemIncrRefCounter(psImageSubset(image, region));
+        break;
       case FPA_READ_TYPE_MASK:
-        if (readout->mask) {
-            psFree (readout->mask);
-        }
-        readout->mask = psMemIncrRefCounter(psImageSubset(image, region));      
-        break;
+        if (readout->mask) {
+            psFree (readout->mask);
+        }
+        readout->mask = psMemIncrRefCounter(psImageSubset(image, region));
+        break;
       case FPA_READ_TYPE_WEIGHT:
-        if (readout->weight) {
-            psFree (readout->weight);
-        }
-        readout->weight = psMemIncrRefCounter(psImageSubset(image, region));    
-        break;
+        if (readout->weight) {
+            psFree (readout->weight);
+        }
+        readout->weight = psMemIncrRefCounter(psImageSubset(image, region));
+        break;
       default:
-        psAbort("Unknown read type: %x\n", type);
-    }
-    
+        psAbort("Unknown read type: %x\n", type);
+    }
+
     // Get the list of overscans
     // XXX should this step only be performed for IMAGE, not MASK and WEIGHT types?
@@ -210 +210 @@
     // check if we have read the desired data, read it if needed
     bool (*hduReadFunc)(pmHDU*, psFits*) = NULL; // Function to use to read the HDU
-    void *dataPointer = NULL;           // pointer to location of desired data
+    void *dataPointer = NULL;           // pointer to location of desired data
     switch (type) {
       case FPA_READ_TYPE_IMAGE:
@@ -234 +234 @@
     // do we have the data we want (image, header, or etc).
     if (!dataPointer) {
-        // attempt to read in the desired data
-        if (!hduReadFunc(hdu, fits)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to read HDU for cell.\n");
-            return false;
-        }
+        // attempt to read in the desired data
+        if (!hduReadFunc(hdu, fits)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to read HDU for cell.\n");
+            return false;
+        }
     }
 
@@ -250 +250 @@
     // skip the image arrays completely for the header-only files
     if (type == FPA_READ_TYPE_HEADER) {
-        pmCellSetDataStatus(cell, true);
-        return true;
+        pmCellSetDataStatus(cell, true);
+        return true;
     }
 
     // set up pointers for the different possible image arrays
-    psArray *imageArray = NULL; // Array of images in the HDU
+    psArray *imageArray = NULL; // Array of images in the HDU
     psElemType imageType = PS_TYPE_F32; // Expected type for image
     switch (type) {
@@ -263 +263 @@
         break;
       case FPA_READ_TYPE_MASK:
-        imageArray = hdu->masks;
+        imageArray = hdu->masks;
         imageType = PS_TYPE_MASK;
         break;