Changeset 15112 for branches/pap_branch_070920/psModules/src/camera/pmFPAfileIO.c

Timestamp:

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

Author:

Paul Price

Message:

Enabling compression when writing out. Introduces a new field in the FILERULES for output files (COMPRESSION), which provides a keyword which is looked up in COMPRESSION(METADATA) in the camera configuration. That then provides BITPIX,TILE.X,TILE.Y,TILE.Z,NOISE,HSCALE,HSMOOTH to set the compression and bits per pixel. Enabled compression, but not bitpix yet.

File:

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

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

@@ -688 +688 @@
         }
 
-        // 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).
+        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;
+        }
+
+        // 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).
         if (!pmFPAfileReadPHU (file, view, config)) {
-            psError (PS_ERR_IO, true, "error reading PHU for %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
+            psError (PS_ERR_IO, true, "error reading PHU for %s (%s) (%d:%d:%d)\n",
+                     file->filename, file->name, view->chip, view->cell, view->readout);
             return false;
         }
@@ -758 +765 @@
             return false;
         }
-        file->formatName = psStringCopy(config->formatName);
+        file->formatName = psStringCopy(config->formatName);
 
     } else {
@@ -795 +802 @@
       case PM_FPA_FILE_WEIGHT:
       case PM_FPA_FILE_FRINGE:
-        status = pmFPAviewFitsWritePHU (view, file, config);
-        break;
+        status = pmFPAviewFitsWritePHU (view, file, config);
+        break;
       case PM_FPA_FILE_CMF:
-        status = pmSource_CMF_WritePHU (view, file, config);
-        break;
+        status = pmSource_CMF_WritePHU (view, file, config);
+        break;
       case PM_FPA_FILE_PSF:
-        status = pmPSFmodelWritePHU (view, file, config);
-        break;
+        status = pmPSFmodelWritePHU (view, file, config);
+        break;
       case PM_FPA_FILE_SX:
       case PM_FPA_FILE_RAW: