Changeset 21029 for branches/pap_branch_20081216/psModules/src/camera/pmHDU.c

Timestamp:

Dec 17, 2008, 10:24:32 AM (18 years ago)

Author:

Paul Price

Message:

CFITSIO only supports signed 64-bit integers, so we'll use that for the image and source identifiers. Current system works: gets IMAGEID and SOURCEID into the header of outputs. Still need to read these on input, and get a mechanism for them to be set to something reasonable.

File:

• branches/pap_branch_20081216/psModules/src/camera/pmHDU.c (modified) (3 diffs)

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

@@ -245 +245 @@
 
 
-bool pmHDUWriteIdentifiers(pmHDU *hdu, psU64 imageId, psU64 sourceId)
+bool pmHDUWriteIdentifiers(pmHDU *hdu, psS64 imageId, psS64 sourceId)
 {
     PS_ASSERT_PTR_NON_NULL(hdu, false);
@@ -251 +251 @@
     // 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)
+    psMetadataAddS64(hdu->header, PS_LIST_TAIL, "IMAGEID", PS_META_REPLACE, "Image identifier", imageId);
+    psMetadataAddS64(hdu->header, PS_LIST_TAIL, "SOURCEID", PS_META_REPLACE, "Source identifier", sourceId);
+    return true;
+}
+
+bool pmHDUReadIdentifiers(psS64 *imageId, psS64 *sourceId, const pmHDU *hdu)
 {
     PS_ASSERT_PTR_NON_NULL(hdu, false);
@@ -263 +263 @@
 
     bool imageOK, sourceOK;             // Status of MD lookups
-    *imageId = psMetadataLookupU64(&imageOK, hdu->header, "IMAGEID");
-    *sourceId = psMetadataLookupU64(&sourceOK, hdu->header, "SOURCEID");
+    *imageId = psMetadataLookupS64(&imageOK, hdu->header, "IMAGEID");
+    *sourceId = psMetadataLookupS64(&sourceOK, hdu->header, "SOURCEID");
 
     return imageOK && sourceOK;