Changeset 6552 for branches/rel10_ifa/psModules/src/astrom/pmHDU.c

Timestamp:

Mar 8, 2006, 5:08:08 PM (20 years ago)

Author:

Paul Price

Message:

Broad changes to introduce pmHDU, and allow read/write at any level. Modified the camera configuration to use camera config (components of the camera) and format descriptions (FITS file layout).

File:

• branches/rel10_ifa/psModules/src/astrom/pmHDU.c (modified) (8 diffs)

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

@@ -9 +9 @@
 {
     psFree(hdu->extname);
+    psFree(hdu->format);
     psFree(hdu->header);
     psFree(hdu->images);
@@ -32 +33 @@
         hdu->extname = psStringCopy(extname);
     }
+    hdu->format = NULL;
     hdu->header = NULL;
     hdu->images = NULL;
     hdu->table  = NULL;
 
-    return file;
+    return hdu;
 }
 
@@ -54 +56 @@
             return false;
         }
-    } else if (! psFitsMoveExtName(fits, hdu->extname)) {
-        psError(PS_ERR_IO, false, "Unable to move to extension %s\n", hdu->extname);
+        hdu->phu = true;
+    } else {
+        if (! psFitsMoveExtName(fits, hdu->extname)) {
+            psError(PS_ERR_IO, false, "Unable to move to extension %s\n", hdu->extname);
+        }
+        // Now, just in case for some reason the PHU has an extension name that we've moved to....
+        if (psFitsGetExtNum(fits) == 0) {
+            hdu->phu = true;
+        } else {
+            hdu->phu = false;
+        }
     }
 
@@ -63 +74 @@
     }
 
+    #ifdef FITS_TABLES
     // What type is it?
     if (psFitsIsImage(hdu->header)) {
+        #endif
         if (hdu->images) {
             psFree(hdu->images);        // Blow away anything existing
@@ -70 +83 @@
         hdu->images = psFitsReadImageCube(fits, psRegionSet(0,0,0,0));
         return true;
+        #ifdef FITS_TABLES
+
     }
     if (psFitsIsTable(hdu->table)) {
@@ -82 +97 @@
     psError(PS_ERR_UNKNOWN, true, "No idea what this HDU consists of!\n");
     return false;
+    #endif
 }
 
@@ -99 +115 @@
     }
 
+    #ifdef FITS_TABLES
     if (hdu->images && (!hdu->table || psFitsIsImage(hdu->header))) {
+        #endif
         psFitsWriteImageCube(fits, hdu->header, hdu->images, hdu->extname);
         return true;
+        #ifdef FITS_TABLES
+
     }
 
@@ -111 +131 @@
     psError(PS_ERR_IO, true, "No idea what this HDU consists of!\n");
     return false;
-}
-
-
-pmHDU *pmHDUFromFPA(pmFPA *fpa          // FPA for which to find HDU
-                   )
-{
-    return fpa->hdu;
-}
-
-pmHDU *pmHDUFromChip(pmChip *chip       // Chip for which to find HDU
-                    )
-{
-    pmHDU *hdu = chip->hdu;             // The HDU information
-    if (!hdu) {
-        hdu = pmHDUFromFPA(chip->parent); // Grab HDU info from the FPA
-    }
-
-    return hdu;
-}
-
-pmHDU *pmHDUFromCell(pmCell *cell       // Cell for which to find HDU
-                    )
-{
-    pmHDU *hdu = cell->hdu;             // The HDU information
-    if (!hdu) {
-        hdu = pmHDUFromChip(cell->parent); // Grab HDU info from the chip
-    }
-
-    return hdu;
-}
-
+    #endif
+}