Changeset 27992 for trunk/psModules/src/camera/pmFPAWrite.c

Timestamp:

May 18, 2010, 11:02:08 AM (16 years ago)

Author:

Paul Price

Message:

Missed an occurence of FPA.OBS

File:

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

trunk/psModules/src/camera/pmFPAWrite.c

@@ -165 +165 @@
     // generate the HDU, but only copies the structure.
     if (!blank && !hdu->blankPHU && !*imageArray) {
-        if (!pmHDUGenerateForCell(cell)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to generate HDU for cell --- likely programming error.");
-            return false;
-        }
-        if (!*imageArray) {
-            if (type == FPA_WRITE_TYPE_IMAGE) {
-                psError(PS_ERR_UNKNOWN, false, "Expected to write an image, but it is missing...programming error?.");
-                return false;
-            }
-            if (type == FPA_WRITE_TYPE_MASK) {
-                psWarning("No mask image for this cell; skipping");
-            }
-            if (type == FPA_WRITE_TYPE_VARIANCE) {
-                psWarning("No variance image for this cell; skipping");
-            }
-            return true;
-        }
+        if (!pmHDUGenerateForCell(cell)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to generate HDU for cell --- likely programming error.");
+            return false;
+        }
+        if (!*imageArray) {
+            if (type == FPA_WRITE_TYPE_IMAGE) {
+                psError(PS_ERR_UNKNOWN, false, "Expected to write an image, but it is missing...programming error?.");
+                return false;
+            }
+            if (type == FPA_WRITE_TYPE_MASK) {
+                psWarning("No mask image for this cell; skipping");
+            }
+            if (type == FPA_WRITE_TYPE_VARIANCE) {
+                psWarning("No variance image for this cell; skipping");
+            }
+            return true;
+        }
     }
 
@@ -307 +307 @@
 
         if (writeBlank || writeImage) {
-            if (!pmConceptsWriteFPA(fpa, true, config)) {
+            if (!pmConceptsWriteFPA(fpa, true, config)) {
                 psError(PS_ERR_IO, false, "Unable to write concepts for FPA.\n");
                 return false;
@@ -341 +341 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// Update the FPA.OBS, CHIP.NAME and CELL.NAME in the FITS header, if required
+// Update the CHIP.NAME and CELL.NAME in the FITS header, if required
 bool pmFPAUpdateNames(pmFPA *fpa, pmChip *chip, pmCell *cell, psS64 imageId, psS64 sourceId)
 {
@@ -375 +375 @@
         psError(PS_ERR_UNKNOWN, true, "Unable to find FILE information in camera format.\n");
         return false;
-    }
-    if (fpa) {
-        const char *fpaObsHdr = psMetadataLookupStr(&mdok, fileData, "FPA.OBS");
-        if (mdok && fpaObsHdr && strlen(fpaObsHdr) > 0) {
-            const char *fpaObs = psMetadataLookupStr(NULL, fpa->concepts, "FPA.OBS");
-            psMetadataAddStr(hduHigh->header, PS_LIST_TAIL, fpaObsHdr, PS_META_REPLACE,
-                             "Observation identifier", fpaObs);
-        }
     }