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

Timestamp:

Jul 15, 2008, 10:25:00 AM (18 years ago)

Author:

eugene

Message:

re-organization of the named mask bit handling: pmConfigMaskSetBits now assigns the bits to names and make the recipe consistent

File:

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

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -9 +9 @@
 
 #include "pmConfig.h"
+#include "pmConfigMask.h"
 #include "pmDetrendDB.h"
 
@@ -428 +429 @@
             }
             pmConfigConformHeader(hdu->header, file->format);
+
+            // whenever we write out a mask image, we should define the bits which represent mask concepts
+            if (file->type == PM_FPA_FILE_MASK) {
+                assert (hdu->header);
+                if (!pmConfigMaskWriteHeader (config, hdu->header)) {
+                    psError(PS_ERR_UNKNOWN, false, "failed to set the bitmask names in the PHU header for Image %s (%s)\n", file->filename, file->name);
+                    return false;
+                }
+            }
         }
 
@@ -792 +802 @@
           }
 
+          // 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