Changeset 25768 for trunk/psModules/src/camera/pmFPAfileFitsIO.c

Timestamp:

Oct 5, 2009, 12:38:57 PM (17 years ago)

Author:

Paul Price

Message:

The header keywords set by pmFPAUpdateNames are more important than
the concepts --- ensure they are done last so they can overwrite the
concepts if necessary.

File:

• trunk/psModules/src/camera/pmFPAfileFitsIO.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileFitsIO.c

@@ -178 +178 @@
           pmChip *chip = pmFPAviewThisChip(view, fpa); // Chip of interest, or NULL
           pmCell *cell = pmFPAviewThisCell(view, fpa); // Cell of interest, or NULL
-          if (!pmFPAUpdateNames(fpa, chip, cell, file->imageId, file->sourceId)) {
-              psError(PS_ERR_UNKNOWN, false, "Unable to update names in header.");
-              return false;
-          }
-
           if (cell) {
               if (!pmConceptsWriteCell(cell, true, config)) {
@@ -195 +190 @@
           } else if (!pmConceptsWriteFPA(fpa, true, config)) {
               psError(PS_ERR_IO, false, "Unable to write concepts for FPA.\n");
+              return false;
+          }
+
+          if (!pmFPAUpdateNames(fpa, chip, cell, file->imageId, file->sourceId)) {
+              psError(PS_ERR_UNKNOWN, false, "Unable to update names in header.");
               return false;
           }