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

Timestamp:

Feb 5, 2009, 4:31:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

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

trunk/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:
@@ -771 +771 @@
           }
 
-          // XXX if we have a mask file, then we need to read the mask bit names
-          // defined for this file
-          if (file->type == PM_FPA_FILE_MASK) {
-            if (!pmConfigMaskReadHeader (config, phu)) {
-                psError(PS_ERR_IO, false, "error in mask bits");
-                return false;
-            }
-          }
-
           // determine the current format from the header
           // 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;
-          file->format = pmConfigCameraFormatFromHeader (&camera, &cameraName, &formatName, config, phu, true);
+          psMetadata *camera = NULL;
+          psString formatName = NULL;
+          psString cameraName = NULL;
+          file->format = pmConfigCameraFormatFromHeader(&camera, &cameraName, &formatName, config, phu, true);
           if (!file->format) {
             psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", file->filename);
@@ -794 +785 @@
           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 +929 @@
       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: