Changeset 18554 for trunk/psModules/src/camera/pmFPAfileDefine.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/pmFPAfileDefine.c (modified) (5 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -10 +10 @@
 #include "pmErrorCodes.h"
 #include "pmConfig.h"
+#include "pmConfigMask.h"
 #include "pmDetrendDB.h"
 
@@ -489 +490 @@
         psFree(realName);
         return NULL;
+    }
+
+    if (file->type == PM_FPA_FILE_MASK) {
+        if (!pmConfigMaskReadHeader (config, phu)) {
+            psError(PS_ERR_IO, false, "error in mask bits");
+            return NULL;
+        }
     }
 
@@ -660 +668 @@
     file->fileLevel = input->fileLevel;
 
+
     // define the rule to identify these files in the file->names data
     psFree (file->filerule);
@@ -735 +744 @@
         psMetadataAddStr (file->names, PS_LIST_TAIL, name, 0, "", infiles->data[i]);
 
+        if ((i == 0) && (file->type == PM_FPA_FILE_MASK)) {
+            if (!pmConfigMaskReadHeader (config, phu)) {
+                psError(PS_ERR_IO, false, "error in mask bits");
+                return NULL;
+            }
+        }
+
         psFree(view);
         psFree(name);
@@ -806 +822 @@
         psFree(formatName);
         return NULL;
+    }
+
+    if (file->type == PM_FPA_FILE_MASK) {
+        if (!pmConfigMaskReadHeader (config, phu)) {
+            psError(PS_ERR_IO, false, "error in mask bits");
+            return NULL;
+        }
     }