Changeset 15629

Timestamp:

Nov 15, 2007, 3:00:13 PM (18 years ago)

Author:

Paul Price

Message:

Adding support for choosing desired BITPIX, and for custom floating-point schemes.

Location:

trunk/psModules/src/camera

Files:

• pmFPAfile.c (modified) (1 diff)
• pmFPAfile.h (modified) (2 diffs)
• pmFPAfileDefine.c (modified) (4 diffs)
• pmFPAfileIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfile.c

@@ -75 +75 @@
     file->compression = NULL;
     file->bitpix = 0;
+    file->floatType = PS_FITS_FLOAT_NONE;
     file->names = psMetadataAlloc();
 

trunk/psModules/src/camera/pmFPAfile.h

@@ -4 +4 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-11-10 01:09:20 $
+ * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-11-16 01:00:13 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -66 +66 @@
     psFitsCompression *compression;     // Compression for FITS images
     int bitpix;                         // Bits per pixel for output
+    psFitsFloat floatType;              // Custom floating-point
 
     bool wrote_phu;                     // have we written a PHU for this file?

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -219 +219 @@
             goto COMPRESSION_DONE;
         }
-        const char *typeString = psMetadataLookupStr(NULL, scheme, "COMPRESSION"); // Compression type
+        const char *typeString = psMetadataLookupStr(NULL, scheme, "COMP"); // Compression type
         if (!typeString || strlen(typeString) == 0) {
-            psWarning("Can't find COMPRESSION in FITS scheme %s --- compression disabled.", fitsType);
+            psWarning("Can't find COMP in FITS scheme %s --- compression disabled.", fitsType);
             goto COMPRESSION_DONE;
         }
@@ -228 +228 @@
         psString source = NULL;         // Source of options
         psStringAppend(&source, "%s in FITS in camera %s", fitsType, cameraName);
+        file->bitpix = parseOptionInt(scheme, "BITPIX", source, 0); // Bits per pixel
+
+        // Custom floating-point
+        const char *floatName = psMetadataLookupStr(NULL, scheme, "FLOAT"); // Name of custom floating-point
+        if (floatName) {
+            psString fullName = NULL;   // Full name of custom floating-point
+            psStringAppend(&fullName, "FLOAT_%s", floatName);
+            file->floatType = psFitsFloatTypeFromString(fullName);
+            psFree(fullName);
+        }
+
         psVector *tile = psVectorAlloc(3, PS_TYPE_S32); // Tile sizes
-        file->bitpix = parseOptionInt(scheme, "BITPIX", source, 0); // Bits per pixel
         tile->data.S32[0] = parseOptionInt(scheme, "TILE.X", source, 0); // Tiling in x
         tile->data.S32[1] = parseOptionInt(scheme, "TILE.Y", source, 1); // Tiling in y
@@ -438 +448 @@
                 return NULL;
             }
-            // EXTWORD (fits->extword) is not relevant to the PHU
+            // EXTWORD (fits->extword) is not relevant to the PHU
             fits = psFitsOpen (realName, "r");
             if (!fits) {
@@ -557 +567 @@
             return NULL;
         }
-        // EXTWORD (fits->extword) is not relevant to the PHU
+        // EXTWORD (fits->extword) is not relevant to the PHU
         fits = psFitsOpen (realName, "r");
         if (!fits) {

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -762 +762 @@
         }
 
+        file->fits->floatType = file->floatType;
+
         // In some cases, we need to read the PHU after we've opened the file.  This happens for the images
         // supplied by the detrend database, which are only identified here (pmConfigConvertFilename).