Changeset 15113

Timestamp:

Sep 29, 2007, 12:09:57 PM (19 years ago)

Author:

Paul Price

Message:

Changing the name for storing the compression. It's not all about
compression --- the BITPIX is there too. It's now called "FITS", or
"FITS.TYPE" in the FILERULES.

File:

• branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.c (modified) (2 diffs)

branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.c

@@ -271 +271 @@
     }
 
-    // Get compression scheme
-    const char *compName = psMetadataLookupStr(&status, data, "COMPRESSION"); // Name of compression scheme
-    if (compName && strcasecmp(compName, "NONE") != 0) {
-        psMetadata *compSchemes = psMetadataLookupMetadata(&status, camera, "COMPRESSION"); // Comp. schemes
-        if (!compSchemes) {
-            psWarning("Unable to find COMPRESSION in camera configuration --- compression disabled.");
+    // Get FITS output scheme
+    const char *fitsType = psMetadataLookupStr(&status, data, "FITS.TYPE"); // Name of FITS scheme to use
+    if (fitsType && strcasecmp(fitsType, "NONE") != 0) {
+        psMetadata *fitsTypes = psMetadataLookupMetadata(&status, camera, "FITS"); // The FITS schemes
+        if (!fitsTypes) {
+            psWarning("Unable to find FITS in camera configuration --- compression disabled.");
             goto COMPRESSION_DONE;
         }
-        psMetadata *compression = psMetadataLookupMetadata(NULL, compSchemes, compName); // Compression info
-        if (!compression) {
-            psWarning("Unable to find %s in COMPRESSION in camera configuration --- compression disabled.",
-                      compName);
+        psMetadata *scheme = psMetadataLookupMetadata(NULL, fitsTypes, fitsType); // FITS scheme
+        if (!scheme) {
+            psWarning("Unable to find %s in FITS in camera configuration --- compression disabled.",
+                      fitsType);
             goto COMPRESSION_DONE;
         }
-        const char *typeString = psMetadataLookupStr(NULL, compression, "COMPRESSION"); // Compression type
+        const char *typeString = psMetadataLookupStr(NULL, fitsTypes, "COMPRESSION"); // Compression type
         if (!typeString || strlen(typeString)) {
-            psWarning("Can't find COMPRESSION in compression scheme %s --- compression disabled.", compName);
+            psWarning("Can't find COMPRESSION in FITS scheme %s --- compression disabled.", fitsType);
             goto COMPRESSION_DONE;
         }
@@ -293 +293 @@
 
         psString source = NULL;         // Source of options
-        psStringAppend(&source, "%s in COMPRESSION in camera %s", compName, cameraName);
+        psStringAppend(&source, "%s in FITS in camera %s", fitsType, cameraName);
         psVector *tile = psVectorAlloc(3, PS_TYPE_S32); // Tile sizes
-        file->bitpix = parseOptionInt(compression, "BITPIX", source, 0); // Bits per pixel
-        tile->data.S32[0] = parseOptionInt(compression, "TILE.X", source, 0); // Tiling in x
-        tile->data.S32[1] = parseOptionInt(compression, "TILE.Y", source, 1); // Tiling in y
-        tile->data.S32[2] = parseOptionInt(compression, "TILE.Z", source, 1); // Tiling in z
-        int noise = parseOptionInt(compression, "NOISE", source, 16); // Noise bits
-        int hscale = parseOptionInt(compression, "HSCALE", source, 0); // Scaling for HCOMPRESS
-        int hsmooth = parseOptionInt(compression, "HSMOOTH", source, 0); // Smoothing for HCOMPRESS
+        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
+        tile->data.S32[2] = parseOptionInt(scheme, "TILE.Z", source, 1); // Tiling in z
+        int noise = parseOptionInt(scheme, "NOISE", source, 16); // Noise bits
+        int hscale = parseOptionInt(scheme, "HSCALE", source, 0); // Scaling for HCOMPRESS
+        int hsmooth = parseOptionInt(scheme, "HSMOOTH", source, 0); // Smoothing for HCOMPRESS
         psFree(source);