Changeset 21211 for branches/pap_branch_20090128/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Jan 28, 2009, 2:33:51 PM (17 years ago)

Author:

Paul Price

Message:

Changing pmReadout.weight to variance. Adding pmReadout.covariance which will carry around a covariance pseudo-matrix, allowing us to calculate the pixel-to-pixel variance. pmReadout.covariance now exists and is set, but no mechanism yet to read/write, or use it.

File:

• branches/pap_branch_20090128/psModules/src/camera/pmFPAfileIO.c (modified) (10 diffs)

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

@@ -173 +173 @@
         status = pmFPAviewReadFitsMask(view, file, config);
         break;
-      case PM_FPA_FILE_WEIGHT:
-        status = pmFPAviewReadFitsWeight(view, file, config);
+      case PM_FPA_FILE_VARIANCE:
+        status = pmFPAviewReadFitsVariance(view, file, config);
         break;
       case PM_FPA_FILE_HEADER:
@@ -262 +262 @@
       case PM_FPA_FILE_IMAGE:
       case PM_FPA_FILE_MASK:
-      case PM_FPA_FILE_WEIGHT:
+      case PM_FPA_FILE_VARIANCE:
       case PM_FPA_FILE_FRINGE:
       case PM_FPA_FILE_DARK: {
@@ -427 +427 @@
         status = pmFPAviewWriteFitsMask(view, file, config);
         break;
-      case PM_FPA_FILE_WEIGHT:
-        status = pmFPAviewWriteFitsWeight(view, file, config);
+      case PM_FPA_FILE_VARIANCE:
+        status = pmFPAviewWriteFitsVariance(view, file, config);
         break;
       case PM_FPA_FILE_HEADER:
@@ -524 +524 @@
       case PM_FPA_FILE_IMAGE:
       case PM_FPA_FILE_MASK:
-      case PM_FPA_FILE_WEIGHT:
+      case PM_FPA_FILE_VARIANCE:
       case PM_FPA_FILE_HEADER:
       case PM_FPA_FILE_FRINGE:
@@ -589 +589 @@
       case PM_FPA_FILE_IMAGE:
       case PM_FPA_FILE_MASK:
-      case PM_FPA_FILE_WEIGHT:
+      case PM_FPA_FILE_VARIANCE:
       case PM_FPA_FILE_HEADER:
       case PM_FPA_FILE_FRINGE:
@@ -730 +730 @@
     psString tmpName = pmConfigConvertFilename (file->filename, config, create, false);
     if (!tmpName) {
-        psError(PS_ERR_IO, false, "failed to determine real name from template for %s\n", file->filename);
-        return false;
+        psError(PS_ERR_IO, false, "failed to determine real name from template for %s\n", file->filename);
+        return false;
     }
     psFree (file->filename);
@@ -740 +740 @@
       case PM_FPA_FILE_IMAGE:
       case PM_FPA_FILE_MASK:
-      case PM_FPA_FILE_WEIGHT:
+      case PM_FPA_FILE_VARIANCE:
       case PM_FPA_FILE_HEADER:
       case PM_FPA_FILE_FRINGE:
@@ -783 +783 @@
           // determine camera if not specified already
           // XXX can I actually reach this with camera not specified??
-          psMetadata *camera = NULL;
-          psString formatName = NULL;
-          psString cameraName = NULL;
+          psMetadata *camera = NULL;
+          psString formatName = NULL;
+          psString cameraName = NULL;
           file->format = pmConfigCameraFormatFromHeader (&camera, &cameraName, &formatName, config, phu, true);
           if (!file->format) {
@@ -794 +794 @@
           psFree(phu);
 
-          pmFPA *newFPA = pmFPAConstruct (camera, formatName);
-          if (!newFPA) {
-              psError(PS_ERR_IO, false, "Failed to construct FPA from %s for %s", file->filename, formatName);
-              psFree(camera);
-              psFree(formatName);
-              return NULL;
-          }
-          psFree(camera);
-          psFree(formatName);
-          psFree(cameraName);
-
-          // XXX this is really dangerous...
-          psFree (file->fpa);
-          file->fpa = newFPA;
+          pmFPA *newFPA = pmFPAConstruct (camera, formatName);
+          if (!newFPA) {
+              psError(PS_ERR_IO, false, "Failed to construct FPA from %s for %s", file->filename, formatName);
+              psFree(camera);
+              psFree(formatName);
+              return NULL;
+          }
+          psFree(camera);
+          psFree(formatName);
+          psFree(cameraName);
+
+          // XXX this is really dangerous...
+          psFree (file->fpa);
+          file->fpa = newFPA;
         }
 
@@ -938 +938 @@
       case PM_FPA_FILE_IMAGE:
       case PM_FPA_FILE_MASK:
-      case PM_FPA_FILE_WEIGHT:
+      case PM_FPA_FILE_VARIANCE:
       case PM_FPA_FILE_DARK:
       case PM_FPA_FILE_FRINGE: