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

Timestamp:

Feb 2, 2009, 8:05:38 AM (17 years ago)

Author:

Paul Price

Message:

Adding work on integrating covariances into the read/write system. Not sure I like this framework (putting covariances for an HDU into a common table); might rework to write a covariance image for each cell. I think I started doing that and ran into problems, but I can't remember what they were and how they stopped me.

File:

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

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

@@ -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
@@ -786 +777 @@
           psString formatName = NULL;
           psString cameraName = NULL;
-          file->format = pmConfigCameraFormatFromHeader (&camera, &cameraName, &formatName, config, phu, true);
+          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);