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

Timestamp:

Mar 6, 2008, 10:47:50 AM (18 years ago)

Author:

Paul Price

Message:

Adding multi-darks --- fitting dark current with multi-dimensional polynomial. This allows the dark current to be a function of temperature, or time since PON. To do this, added new file type, DARK. A DARK file is just like an IMAGE, except that it has a table per FITS file that contains the parameters to use in applying the dark. It's kinda like a FRINGE, but there's only one table per file, instead of one table per extension.

File:

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

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -174 +174 @@
         status = pmFPAviewReadFitsHeaderSet(view, file);
         break;
+      case PM_FPA_FILE_DARK:
+        status = pmFPAviewReadFitsDark(view, file);
+        break;
       case PM_FPA_FILE_FRINGE:
-        status = pmFPAviewReadFitsImage (view, file);
+        status = pmFPAviewReadFitsImage(view, file);
         if (status) {
             if (!pmFPAviewReadFitsTable(view, file, "FRINGE")) {
@@ -247 +250 @@
 
     switch (file->type) {
-    case PM_FPA_FILE_IMAGE:
-    case PM_FPA_FILE_MASK:
-    case PM_FPA_FILE_WEIGHT:
-    case PM_FPA_FILE_FRINGE: {
+      case PM_FPA_FILE_IMAGE:
+      case PM_FPA_FILE_MASK:
+      case PM_FPA_FILE_WEIGHT:
+      case PM_FPA_FILE_FRINGE:
+      case PM_FPA_FILE_DARK: {
             // create FPA structure component based on view
             psMetadata *format = file->format; // Camera format configuration
@@ -397 +401 @@
     fitsType |= (file->type == PM_FPA_FILE_HEADER);
     fitsType |= (file->type == PM_FPA_FILE_FRINGE);
+    fitsType |= (file->type == PM_FPA_FILE_DARK);
     fitsType |= (file->type == PM_FPA_FILE_CMP);
     fitsType |= (file->type == PM_FPA_FILE_CMF);
@@ -451 +456 @@
       case PM_FPA_FILE_HEADER:
         psAbort ("no HEADER write functions defined");
+        break;
+      case PM_FPA_FILE_DARK:
+        status = pmFPAviewWriteFitsDark(view, file, config);
         break;
       case PM_FPA_FILE_FRINGE:
@@ -532 +540 @@
       case PM_FPA_FILE_HEADER:
       case PM_FPA_FILE_FRINGE:
+      case PM_FPA_FILE_DARK:
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
@@ -593 +602 @@
       case PM_FPA_FILE_HEADER:
       case PM_FPA_FILE_FRINGE:
+      case PM_FPA_FILE_DARK:
         status = pmFPAviewFreeData(view, file);
         break;
@@ -736 +746 @@
       case PM_FPA_FILE_HEADER:
       case PM_FPA_FILE_FRINGE:
+      case PM_FPA_FILE_DARK:
       case PM_FPA_FILE_CMF:
       case PM_FPA_FILE_PSF:
@@ -882 +893 @@
       case PM_FPA_FILE_MASK:
       case PM_FPA_FILE_WEIGHT:
+      case PM_FPA_FILE_DARK:
       case PM_FPA_FILE_FRINGE:
         status = pmFPAviewFitsWritePHU (view, file, config);