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

Timestamp:

Aug 25, 2008, 12:14:04 PM (18 years ago)

Author:

Paul Price

Message:

Adding I/O of subtraction kernels to pmFPAfile stuff.

File:

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

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -40 +40 @@
 #include "pmSourcePlots.h"
 #include "pmFPAConstruct.h"
+#include "pmSubtractionIO.h"
 #include "pmConcepts.h"
 
@@ -188 +189 @@
         }
         break;
+      case PM_FPA_FILE_SUBKERNEL:
+        status = pmSubtractionReadKernels(view, file, config);
+        break;
       case PM_FPA_FILE_SX:
       case PM_FPA_FILE_RAW:
@@ -258 +262 @@
       case PM_FPA_FILE_FRINGE:
       case PM_FPA_FILE_DARK: {
-            // create FPA structure component based on view
-            psMetadata *format = file->format; // Camera format configuration
-            if (!format) {
-                format = config->format;
-            }
-
-            pmFPA *nameSource = file->src; // Source of FPA.OBS
-            if (!nameSource) {
-                nameSource = file->fpa;
-            }
-            bool mdok;                  // Status of MD lookup
-            const char *fpaObs = psMetadataLookupStr(&mdok, nameSource->concepts, "FPA.OBS"); // Obs. id
-
-            pmFPAAddSourceFromView(file->fpa, fpaObs, view, format);
-            psTrace ("psModules.camera", 5, "created fpa data elements for %s (%s) (%d:%d:%d)\n",
-                     file->name, file->name, view->chip, view->cell, view->readout);
-            break;
-    }
-    case PM_FPA_FILE_HEADER:
-      psAbort ("Create not defined for HEADER");
-      break;
-    case PM_FPA_FILE_SX:
-    case PM_FPA_FILE_RAW:
-    case PM_FPA_FILE_OBJ:
-    case PM_FPA_FILE_CMP:
-    case PM_FPA_FILE_CMF:
-    case PM_FPA_FILE_PSF:
-    case PM_FPA_FILE_ASTROM_MODEL:
-    case PM_FPA_FILE_ASTROM_REFSTARS:
-    case PM_FPA_FILE_JPEG:
-    case PM_FPA_FILE_KAPA:
-        break;
-
-    default:
+          // create FPA structure component based on view
+          psMetadata *format = file->format; // Camera format configuration
+          if (!format) {
+              format = config->format;
+          }
+
+          pmFPA *nameSource = file->src; // Source of FPA.OBS
+          if (!nameSource) {
+              nameSource = file->fpa;
+          }
+          bool mdok;                  // Status of MD lookup
+          const char *fpaObs = psMetadataLookupStr(&mdok, nameSource->concepts, "FPA.OBS"); // Obs. id
+
+          pmFPAAddSourceFromView(file->fpa, fpaObs, view, format);
+          psTrace ("psModules.camera", 5, "created fpa data elements for %s (%s) (%d:%d:%d)\n",
+                   file->name, file->name, view->chip, view->cell, view->readout);
+          break;
+      }
+      case PM_FPA_FILE_HEADER:
+        psAbort ("Create not defined for HEADER");
+        break;
+      case PM_FPA_FILE_SUBKERNEL:
+      case PM_FPA_FILE_SX:
+      case PM_FPA_FILE_RAW:
+      case PM_FPA_FILE_OBJ:
+      case PM_FPA_FILE_CMP:
+      case PM_FPA_FILE_CMF:
+      case PM_FPA_FILE_PSF:
+      case PM_FPA_FILE_ASTROM_MODEL:
+      case PM_FPA_FILE_ASTROM_REFSTARS:
+      case PM_FPA_FILE_JPEG:
+      case PM_FPA_FILE_KAPA:
+        break;
+
+      default:
         psError(PS_ERR_IO, true, "Unsupported type for %s: %d", file->name, file->type);
         return false;
@@ -435 +440 @@
             }
         }
+        break;
+      case PM_FPA_FILE_SUBKERNEL:
+        status = pmSubtractionWriteKernels(view, file, config);
         break;
       case PM_FPA_FILE_SX:
@@ -512 +520 @@
       case PM_FPA_FILE_FRINGE:
       case PM_FPA_FILE_DARK:
+      case PM_FPA_FILE_SUBKERNEL:
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
@@ -577 +586 @@
         status = pmFPAviewFreeData(view, file);
         break;
+      case PM_FPA_FILE_SUBKERNEL:
       case PM_FPA_FILE_SX:
       case PM_FPA_FILE_RAW:
@@ -720 +730 @@
       case PM_FPA_FILE_FRINGE:
       case PM_FPA_FILE_DARK:
+      case PM_FPA_FILE_SUBKERNEL:
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
@@ -899 +910 @@
         status = pmFPAviewFitsWritePHU (view, file, config);
         break;
+      case PM_FPA_FILE_SUBKERNEL:
+        status = pmSubtractionWritePHU(view, file, config);
       case PM_FPA_FILE_CMF:
         status = pmSource_CMF_WritePHU (view, file, config);
         break;
       case PM_FPA_FILE_PSF:
-        status = pmPSFmodelWritePHU (view, file, config);
+        status = pmPSFmodelWritePHU(view, file, config);
         break;
       case PM_FPA_FILE_ASTROM_REFSTARS: