Changeset 10081 for trunk/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Nov 18, 2006, 1:43:28 PM (19 years ago)

Author:

Paul Price

Message:

Extensive changes to FPA reading/writing functions to support mask and weight map reading/writing. Actually, not so much changes as generalisations to the reading/writing functions. Moved the reading/writing functionality into file-static functions, which the higher level functions for reading/writing particular elements (image, mask, weight) call. Added additional pmFPAfile types for mask and weight, with supporting functionality to call the reading/writing functions.

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (7 diffs)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -225 +225 @@
         // open the FITS types:
     case PM_FPA_FILE_IMAGE:
+    case PM_FPA_FILE_MASK:
+    case PM_FPA_FILE_WEIGHT:
     case PM_FPA_FILE_FRINGE:
         psTrace ("pmFPAfile", 5, "opening %s (type: %d)\n", file->filename, file->type);
@@ -311 +313 @@
     switch (file->type) {
     case PM_FPA_FILE_IMAGE:
-        if (!pmFPAviewReadFitsImage (view, file)) {
+        if (!pmFPAviewReadFitsImage(view, file)) {
+            psError(PS_ERR_UNKNOWN, false, "skipping %s (type: %d)\n", file->filename, file->type);
+            return false;
+        }
+        psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
+        break;
+    case PM_FPA_FILE_MASK:
+        if (!pmFPAviewReadFitsMask(view, file)) {
+            psError(PS_ERR_UNKNOWN, false, "skipping %s (type: %d)\n", file->filename, file->type);
+            return false;
+        }
+        psTrace ("pmFPAfile", 5, "reading %s (type: %d)\n", file->filename, file->type);
+        break;
+    case PM_FPA_FILE_WEIGHT:
+        if (!pmFPAviewReadFitsWeight(view, file)) {
             psError(PS_ERR_UNKNOWN, false, "skipping %s (type: %d)\n", file->filename, file->type);
             return false;
@@ -384 +400 @@
     switch (file->type) {
     case PM_FPA_FILE_IMAGE:
-        if (pmFPAviewFreeFitsImage (view, file)) {
+    case PM_FPA_FILE_MASK:
+    case PM_FPA_FILE_WEIGHT:
+    case PM_FPA_FILE_FRINGE:
+        if (pmFPAviewFreeData(view, file)) {
             psTrace ("pmFPAfile", 5, "freed %s for %s (type: %d)\n", file->filename, file->name, file->type);
             if (file->filename == NULL) {
@@ -394 +413 @@
         }
         break;
-    case PM_FPA_FILE_FRINGE:
-        if (!pmFPAviewFreeFitsTable(view, file, "FRINGE")) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to free fringe data.\n");
-            return false;
-        }
-        break;
-
     case PM_FPA_FILE_SX:
     case PM_FPA_FILE_RAW:
@@ -469 +481 @@
     switch (file->type) {
     case PM_FPA_FILE_IMAGE:
+        pmFPAviewWriteFitsImage(view, file);
+        psTrace ("pmFPAfile", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa);
+        break;
+    case PM_FPA_FILE_MASK:
+        pmFPAviewWriteFitsMask(view, file);
+        psTrace ("pmFPAfile", 5, "wrote mask %s (fpa: %p)\n", file->filename, file->fpa);
+        break;
+    case PM_FPA_FILE_WEIGHT:
+        pmFPAviewWriteFitsWeight(view, file);
+        psTrace ("pmFPAfile", 5, "wrote weight %s (fpa: %p)\n", file->filename, file->fpa);
+        break;
+    case PM_FPA_FILE_FRINGE:
         pmFPAviewWriteFitsImage (view, file);
         psTrace ("pmFPAfile", 5, "wrote image %s (fpa: %p)\n", file->filename, file->fpa);
-        break;
-    case PM_FPA_FILE_FRINGE:
-        pmFPAviewWriteFitsImage (view, file);
-        psTrace ("pmFPAfile", 5, "wrote table %s (fpa: %p)\n", file->filename, file->fpa);
         pmFPAviewWriteFitsTable(view, file, "FRINGE");
         psTrace ("pmFPAfile", 5, "wrote fringe table %s (fpa: %p)\n", file->filename, file->fpa);
@@ -554 +574 @@
     switch (file->type) {
     case PM_FPA_FILE_IMAGE:
+    case PM_FPA_FILE_MASK:
+    case PM_FPA_FILE_WEIGHT:
     case PM_FPA_FILE_FRINGE:
         // create FPA structure component based on view
@@ -608 +630 @@
         // check the FITS types
     case PM_FPA_FILE_IMAGE:
+    case PM_FPA_FILE_MASK:
+    case PM_FPA_FILE_WEIGHT:
     case PM_FPA_FILE_FRINGE:
     case PM_FPA_FILE_CMF: