Changeset 15166

Timestamp:

Oct 2, 2007, 4:12:34 PM (19 years ago)

Author:

Paul Price

Message:

Enabling compression when writing FITS image files.

File:

• branches/pap_branch_070920/psModules/src/camera/pmFPAfileIO.c (modified) (3 diffs)

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

@@ -370 +370 @@
     }
 
+    if (file->compression) {
+        psTrace("psModules.camera", 7, "Setting compression for %s (%s)\n", file->filename, file->name);
+        if (!psFitsCompressionApply(file->fits, file->compression)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to set compression options for %s (%s) (%d:%d:%d)\n",
+                    file->filename, file->name, view->chip, view->cell, view->readout);
+            return false;
+        }
+    }
+
     // select a writing method
     bool status = true;
@@ -679 +688 @@
             psMetadata *fileMenu = psMetadataLookupMetadata (NULL, config->format, "FILE");
             if (!fileMenu) {
-                psError (PS_ERR_IO, true, "FILE METADATA missing from camera format %s\n", config->formatName);
+                psError (PS_ERR_IO, true, "FILE METADATA missing from camera format %s\n",
+                         config->formatName);
                 return false;
             }
@@ -688 +698 @@
         }
 
-        if (file->compression && !psFitsCompressionApply(file->fits, file->compression)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to set compression options for %s (%s) (%d:%d:%d)\n",
-                     file->filename, file->name, view->chip, view->cell, view->readout);
-            return false;
+        if (file->compression) {
+            psTrace("psModules.camera", 7, "Setting compression for %s (%s)\n", file->filename, file->name);
+            if (!psFitsCompressionApply(file->fits, file->compression)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to set compression options for %s (%s) (%d:%d:%d)\n",
+                        file->filename, file->name, view->chip, view->cell, view->readout);
+                return false;
+            }
         }