Changeset 29833 for trunk/psModules/src/camera

Timestamp:

Nov 25, 2010, 9:45:07 PM (16 years ago)

Author:

watersc1

Message:

Merge of czw_branch/20100817 into trunk. This includes the non-linearity correction application code.

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules/src/camera/pmFPAfile.c (modified) (2 diffs)
• psModules/src/camera/pmFPAfile.h (modified) (1 diff)
• psModules/src/camera/pmFPAfileFitsIO.c (modified) (1 diff)
• psModules/src/camera/pmFPAfileIO.c (modified) (6 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -36 +36 @@
         return;
     }
-
+    psTrace ("pmFPAfileFree", 5, "freeing %s %ld\n", file->name,(psU64) file->fits);
     psAssert(!fpaFileFreeStrict || file->fits == NULL, "File %s wasn't closed.", file->name);
 
@@ -523 +523 @@
     if (!strcasecmp(type, "HEADER"))     {
         return PM_FPA_FILE_HEADER;
+    }
+    if (!strcasecmp(type, "LINEARITY"))  {
+      return PM_FPA_FILE_LINEARITY;
     }
     // deprecate this?

trunk/psModules/src/camera/pmFPAfile.h

@@ -50 +50 @@
     PM_FPA_FILE_SRCTEXT,
     PM_FPA_FILE_PATTERN,
+    PM_FPA_FILE_LINEARITY,
 } pmFPAfileType;
 

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -145 +145 @@
       case PM_FPA_FILE_FRINGE:
       case PM_FPA_FILE_DARK:
+      case PM_FPA_FILE_LINEARITY:
       case PM_FPA_FILE_CMP:
       case PM_FPA_FILE_CMF:

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -233 +233 @@
       case PM_FPA_FILE_JPEG:
       case PM_FPA_FILE_KAPA:
+      case PM_FPA_FILE_LINEARITY:
         break;
       default:
@@ -560 +561 @@
       case PM_FPA_FILE_ASTROM_MODEL:
       case PM_FPA_FILE_ASTROM_REFSTARS:
+      case PM_FPA_FILE_LINEARITY:
         psTrace ("psModules.camera", 5, "closing %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout);
         status = psFitsClose (file->fits);
@@ -575 +577 @@
       case PM_FPA_FILE_JPEG:
       case PM_FPA_FILE_KAPA:
+
         break;
 
@@ -619 +622 @@
       case PM_FPA_FILE_FRINGE:
       case PM_FPA_FILE_DARK:
+        //
         status = pmFPAviewFreeData(view, file);
         break;
@@ -636 +640 @@
       case PM_FPA_FILE_JPEG:
       case PM_FPA_FILE_KAPA:
+      case PM_FPA_FILE_LINEARITY:
         psTrace ("psModules.camera", 5, "nothing to free for %s (%s)\n", file->filename, file->name);
         return true;
@@ -791 +796 @@
       case PM_FPA_FILE_ASTROM_MODEL:
       case PM_FPA_FILE_ASTROM_REFSTARS:
+      case PM_FPA_FILE_LINEARITY:
         psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n",
                  file->filename, file->name, view->chip, view->cell, view->readout);