Changeset 27840 for branches/simtest_nebulous_branches/psModules/src/camera/pmFPAfileFitsIO.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmFPAfileFitsIO.c (modified) (3 diffs)

branches/simtest_nebulous_branches/psModules/src/camera/pmFPAfileFitsIO.c

@@ -162 +162 @@
                   hdu->header = psMetadataAlloc();
               }
+
               pmConfigConformHeader(hdu->header, file->format);
 
@@ -178 +179 @@
           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 +191 @@
           } 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;
           }