Index: trunk/psModules/src/camera/pmHDU.c
===================================================================
--- trunk/psModules/src/camera/pmHDU.c	(revision 9067)
+++ trunk/psModules/src/camera/pmHDU.c	(revision 9604)
@@ -42,5 +42,4 @@
     psFree(hdu->header);
     psFree(hdu->images);
-    psFree(hdu->table);
     psFree(hdu->weights);
     psFree(hdu->masks);
@@ -52,6 +51,5 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-pmHDU *pmHDUAlloc(const char *extname   // Extension name
-                 )
+pmHDU *pmHDUAlloc(const char *extname)
 {
     pmHDU *hdu = psAlloc(sizeof(pmHDU));
@@ -68,5 +66,4 @@
     hdu->header  = NULL;
     hdu->images  = NULL;
-    hdu->table   = NULL;
     hdu->weights = NULL;
     hdu->masks   = NULL;
@@ -75,7 +72,5 @@
 }
 
-bool pmHDUReadHeader(pmHDU *hdu,        // HDU for which to read header
-                     psFits *fits       // FITS file from which to read
-                    )
+bool pmHDUReadHeader(pmHDU *hdu, psFits *fits)
 {
     PS_ASSERT_PTR_NON_NULL(hdu, false);
@@ -100,9 +95,6 @@
 }
 
-// Read the HDU
 // XXX: Add a region specifier?
-bool pmHDURead(pmHDU *hdu,              // HDU to read
-               psFits *fits             // FITS file to read from
-              )
+bool pmHDURead(pmHDU *hdu, psFits *fits)
 {
     PS_ASSERT_PTR_NON_NULL(hdu, false);
@@ -119,41 +111,19 @@
     }
 
-    #ifdef FITS_TABLES
-    // What type is it?
-    if (psFitsIsImage(hdu->header)) {
-        #endif
-        if (hdu->images) {
-            psLogMsg(__func__, PS_LOG_WARN, "HDU %s has already been read --- overwriting.\n", hdu->extname);
-            psFree(hdu->images);        // Blow away anything existing
-        }
-        psTrace("psModules.camera", 5, "Reading the pixels...\n");
-        hdu->images = psFitsReadImageCube(fits, psRegionSet(0,0,0,0));
-        if (! hdu->images) {
-            psError(PS_ERR_IO, false, "Unable to read pixels for extension %s\n", hdu->extname);
-            return false;
-        }
-        return true;
-        #ifdef FITS_TABLES
-
+    if (hdu->images) {
+        psLogMsg(__func__, PS_LOG_WARN, "HDU %s has already been read --- overwriting.\n", hdu->extname);
+        psFree(hdu->images);        // Blow away anything existing
     }
-    if (psFitsIsTable(hdu->table)) {
-        // Read the table
-        if (hdu->table) {
-            psFree(hdu->table);         // Blow away anything existing
-        }
-        hdu->table = psFitsReadTable(fits);
-        return true;
+    psTrace("psModules.camera", 5, "Reading the pixels...\n");
+    hdu->images = psFitsReadImageCube(fits, psRegionSet(0,0,0,0));
+    if (! hdu->images) {
+        psError(PS_ERR_IO, false, "Unable to read pixels for extension %s\n", hdu->extname);
+        return false;
     }
-
-    psError(PS_ERR_UNKNOWN, true, "No idea what this HDU consists of!\n");
-    return false;
-    #endif
+    return true;
 }
 
-// Write the HDU
 // XXX: Add a region specifier?
-bool pmHDUWrite(pmHDU *hdu,             // HDU to write
-                psFits *fits            // FITS file to write to
-               )
+bool pmHDUWrite(pmHDU *hdu, psFits *fits)
 {
     PS_ASSERT_PTR_NON_NULL(hdu, false);
@@ -188,19 +158,4 @@
     }
 
-    #ifdef FITS_TABLES
-    if (hdu->images && (!hdu->table || psFitsIsImage(hdu->header))) {
-        psFitsWriteImageCube(fits, hdu->header, hdu->images, extname);
-        return true;
-    }
-
-    if (hdu->table && (!hdu->images || psFitsIsTable(hdu->header))) {
-        bool psFitsWriteTable(psFits* fits, const psMetadata *header, const psArray* table);
-        return true;
-    }
-
-    psError(PS_ERR_IO, true, "No idea what this HDU consists of!\n");
-    return false;
-    #else
-
     if (hdu->images) {
         psTrace("psModules.camera", 9, "Writing pixels for %s\n", hdu->extname);
@@ -211,5 +166,4 @@
     }
     return true;
-    #endif
 }