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

Timestamp:

Jan 23, 2007, 5:11:19 PM (19 years ago)

Author:

Paul Price

Message:

Enabling different formats for output pmFPAfiles. To do this, needed to overhaul the writing functions to generate a new FPA using the new format, and write that. To get the blank PHU, needed to do similarly for the open function (!), since it writes blanks immediately after opening the file. Tested with inputting 6 megacam split chips and writing to spliced format --- works successfully.

File:

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

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -108 +108 @@
     }
     if (file->mode == PM_FPA_MODE_WRITE) {
+        // Want to write out any potential blank
+        pmFPA *fpa = pmFPAfileSuitableFPA(file, view);
+
         switch (file->fileLevel) {
         case PM_FPA_LEVEL_FPA:
-            pmFPAWrite (file->fpa, file->fits, NULL, true, false);
+            pmFPAWrite(fpa, file->fits, NULL, true, false);
             break;
         case PM_FPA_LEVEL_CHIP: {
-                pmChip *chip = pmFPAviewThisChip(view, file->fpa);
-                pmChipWrite (chip, file->fits, NULL, true, false);
+                pmChip *chip = pmFPAviewThisChip(view, fpa);
+                pmChipWrite(chip, file->fits, NULL, true, false);
                 break;
             }
         case PM_FPA_LEVEL_CELL: {
-                pmCell *cell = pmFPAviewThisCell(view, file->fpa);
+                pmCell *cell = pmFPAviewThisCell(view, fpa);
                 pmCellWrite(cell, file->fits, NULL, true);
                 break;
@@ -126 +129 @@
             break;
         }
+
+        psFree(fpa);
     }
 
@@ -152 +157 @@
         return true;
     }
+
+    #if 0
+    // do we need to open this file?
+    if (level != file->fileLevel) {
+        psTrace("psModules.camera", 6, "skip open of %s at this level %s: fileLevel is %s",
+                file->name, pmFPALevelToName(level), pmFPALevelToName(file->fileLevel));
+        return true;
+    }
+    #endif
 
     if (file->mode == PM_FPA_MODE_NONE) {
@@ -755 +769 @@
         switch (place) {
         case PM_FPA_BEFORE:
+            #if 0
+
+            if (!pmFPAfileOpen(file, view, config)) {
+                psError(PS_ERR_IO, false, "failed OPEN in FPA_BEFORE block for %s", file->name);
+                goto failure;
+            }
+            #endif
             if (!pmFPAfileRead (file, view, config)) {
                 psError(PS_ERR_IO, false, "failed READ in FPA_BEFORE block for %s", file->name);