Changeset 21022

Timestamp:

Dec 16, 2008, 4:37:03 PM (17 years ago)

Author:

Paul Price

Message:

Attempting to get image and source identifiers into headers.

Location:

branches/pap_branch_20081216/psModules/src/camera

Files:

• pmFPARead.h (modified) (2 diffs)
• pmFPAWrite.c (modified) (6 diffs)
• pmFPAWrite.h (modified) (2 diffs)
• pmFPAfile.c (modified) (1 diff)
• pmFPAfile.h (modified) (2 diffs)
• pmFPAfileFitsIO.c (modified) (1 diff)
• pmHDU.c (modified) (1 diff)
• pmHDU.h (modified) (3 diffs)

branches/pap_branch_20081216/psModules/src/camera/pmFPARead.h

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-17 22:16:38 $
+ * @version $Revision: 1.15.36.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-17 02:37:03 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -245 +245 @@
                    const char *name     ///< Specifies the extension name, and target in the analysis metadata
                   );
+
 /// @}
 #endif

branches/pap_branch_20081216/psModules/src/camera/pmFPAWrite.c

@@ -107 +107 @@
     if (writeBlank || writeImage) {
 
-        pmFPAUpdateNames(cell->parent->parent, cell->parent, cell);
         pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
                                  PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE;
@@ -157 +156 @@
 
         if (writeBlank || writeImage) {
-            pmFPAUpdateNames(chip->parent, chip, NULL);
             pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
                                      PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE;
@@ -221 +219 @@
 
         if (writeBlank || writeImage) {
-            pmFPAUpdateNames(fpa, NULL, NULL);
             pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS |
                                      PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_DATABASE;
@@ -255 +252 @@
 
 // Update the FPA.OBS, CHIP.NAME and CELL.NAME in the FITS header, if required
-bool pmFPAUpdateNames(pmFPA *fpa, pmChip *chip, pmCell *cell)
-{
-    pmHDU *hdu = pmHDUGetHighest(fpa, chip, cell); // Highest HDU, i.e., the PHU
-    if (!hdu) {
+bool pmFPAUpdateNames(pmFPA *fpa, pmChip *chip, pmCell *cell, psU64 imageId, psU64 sourceId)
+{
+    pmHDU *hduHigh = pmHDUGetHighest(fpa, chip, cell); // Highest HDU, i.e., the PHU
+    if (!hduHigh) {
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find PHU.\n");
+        return false;
+    }
+    if (!hduHigh->header) {
+        hduHigh->header = psMetadataAlloc();
+    }
+    if (!pmHDUWriteIdentifiers(hduHigh, imageId, sourceId)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to write identifiers to header.");
+        return false;
+    }
+
+    pmHDU *hduLow = pmHDUGetLowest(fpa, chip, cell); // Lowest HDU, i.e., the extension
+    if (!hduLow) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find HDU.\n");
         return false;
     }
-    if (!hdu->header) {
-        hdu->header = psMetadataAlloc();
-    }
+    if (!hduLow->header) {
+        hduLow->header = psMetadataAlloc();
+    }
+    if (hduLow != hduHigh && !pmHDUWriteIdentifiers(hduLow, imageId, sourceId)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to write identifiers to header.");
+        return false;
+    }
+
     bool mdok;                          // Status of MD lookup
-    psMetadata *fileData = psMetadataLookupMetadata(&mdok, hdu->format, "FILE"); // File information
+    psMetadata *fileData = psMetadataLookupMetadata(&mdok, hduHigh->format, "FILE"); // File information
     if (!mdok || !fileData) {
         psError(PS_ERR_UNKNOWN, true, "Unable to find FILE information in camera format.\n");
@@ -275 +290 @@
         if (mdok && fpaObsHdr && strlen(fpaObsHdr) > 0) {
             const char *fpaObs = psMetadataLookupStr(NULL, fpa->concepts, "FPA.OBS");
-            psMetadataAddStr(hdu->header, PS_LIST_TAIL, fpaObsHdr, PS_META_REPLACE,
+            psMetadataAddStr(hduHigh->header, PS_LIST_TAIL, fpaObsHdr, PS_META_REPLACE,
                              "Observation identifier", fpaObs);
         }
@@ -298 +313 @@
         }
 
-        psMetadataAddStr(hdu->header, PS_LIST_TAIL, contentKey, PS_META_REPLACE, "Content of file", content);
+        psMetadataAddStr(hduHigh->header, PS_LIST_TAIL, contentKey, PS_META_REPLACE,
+                         "Content of file", content);
         psFree(content);                // Drop reference
     }

branches/pap_branch_20081216/psModules/src/camera/pmFPAWrite.h

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-06-17 22:16:38 $
+ * @version $Revision: 1.11.36.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-17 02:37:03 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -165 +165 @@
                    );
 
-// XXX better name, please
-bool pmFPAUpdateNames(pmFPA *fpa, pmChip *chip, pmCell *cell);
+// Update the header before writing to be consistent
+//
+// XXX Would like a better name
+bool pmFPAUpdateNames(pmFPA *fpa,       ///< FPA
+                      pmChip *chip,     ///< Chip, or NULL
+                      pmCell *cell,     ///< Cell, or NULL
+                      psU64 imageId,    ///< Image identifier
+                      psU64 sourceId    ///< Source identifier
+    );
 
 /// @}

branches/pap_branch_20081216/psModules/src/camera/pmFPAfile.c

@@ -98 +98 @@
 
     file->save = false;
+
+    file->imageId = 0;
+    file->sourceId = 0;
 
     return file;

branches/pap_branch_20081216/psModules/src/camera/pmFPAfile.h

@@ -4 +4 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-09-02 19:06:16 $
+ * @version $Revision: 1.33.14.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-17 02:37:03 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -106 +106 @@
     psMetadata *format;                 // Camera format
     psString formatName;                // name of the camera format
+
+    psU64 imageId, sourceId;            // Image and source identifiers
 } pmFPAfile;
 

branches/pap_branch_20081216/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)) {
+          if (!pmFPAUpdateNames(fpa, chip, cell, file->imageId, file->sourceId)) {
               psError(PS_ERR_UNKNOWN, false, "Unable to update names in header.");
               return false;

branches/pap_branch_20081216/psModules/src/camera/pmHDU.c

@@ -243 +243 @@
     return hduWrite(hdu, hdu->weights, hdu->masks, maskVal, fits);
 }
+
+
+bool pmHDUWriteIdentifiers(pmHDU *hdu, psU64 imageId, psU64 sourceId)
+{
+    PS_ASSERT_PTR_NON_NULL(hdu, false);
+
+    // XXX Get header keyword name from camera configuration
+
+    psMetadataAddU64(hdu->header, PS_LIST_TAIL, "IMAGEID", PS_META_REPLACE, "Image identifier", imageId);
+    psMetadataAddU64(hdu->header, PS_LIST_TAIL, "SOURCEID", PS_META_REPLACE, "Source identifier", sourceId);
+    return true;
+}
+
+bool pmHDUReadIdentifiers(psU64 *imageId, psU64 *sourceId, const pmHDU *hdu)
+{
+    PS_ASSERT_PTR_NON_NULL(hdu, false);
+
+    // XXX Get header keyword name from camera configuration
+
+    bool imageOK, sourceOK;             // Status of MD lookups
+    *imageId = psMetadataLookupU64(&imageOK, hdu->header, "IMAGEID");
+    *sourceId = psMetadataLookupU64(&sourceOK, hdu->header, "SOURCEID");
+
+    return imageOK && sourceOK;
+}

branches/pap_branch_20081216/psModules/src/camera/pmHDU.h

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-09-05 08:21:35 $
+ * @version $Revision: 1.9.14.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-17 02:37:03 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -31 +31 @@
     psArray *weights;                   ///< The pixel data
     psArray *masks;                     ///< The pixel data
-}
-pmHDU;
+} pmHDU;
 
 
@@ -85 +84 @@
     );
 
+
+
+/// Read identifiers from FITS header
+bool pmHDUReadIdentifiers(psU64 *imageId, ///< Image identifer, returned
+                          psU64 *sourceId, ///< Source identifier, returned
+                          const pmHDU *hdu ///< HDU from which to read
+    );
+
+/// Write identifiers to FITS header
+bool pmHDUWriteIdentifiers(pmHDU *hdu, ///< HDU to which to write
+                           psU64 imageId, ///< Image identifer
+                           psU64 sourceId ///< Source identifier
+                           );
+
+
 /// @}
 #endif