Changeset 21029

Timestamp:

Dec 17, 2008, 10:24:32 AM (17 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.

Location:

branches/pap_branch_20081216/psModules/src/camera

Files:

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

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

@@ -252 +252 @@
 
 // Update the FPA.OBS, CHIP.NAME and CELL.NAME in the FITS header, if required
-bool pmFPAUpdateNames(pmFPA *fpa, pmChip *chip, pmCell *cell, psU64 imageId, psU64 sourceId)
+bool pmFPAUpdateNames(pmFPA *fpa, pmChip *chip, pmCell *cell, psS64 imageId, psS64 sourceId)
 {
     pmHDU *hduHigh = pmHDUGetHighest(fpa, chip, cell); // Highest HDU, i.e., the PHU

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

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.11.36.1 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-12-17 02:37:03 $
+ * @version $Revision: 1.11.36.2 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-17 20:24:32 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -171 +171 @@
                       pmChip *chip,     ///< Chip, or NULL
                       pmCell *cell,     ///< Cell, or NULL
-                      psU64 imageId,    ///< Image identifier
-                      psU64 sourceId    ///< Source identifier
+                      psS64 imageId,    ///< Image identifier
+                      psS64 sourceId    ///< Source identifier
     );
 

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

@@ -4 +4 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.33.14.1 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-12-17 02:37:03 $
+ * @version $Revision: 1.33.14.2 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-17 20:24:32 $
  * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
  */
@@ -107 +107 @@
     psString formatName;                // name of the camera format
 
-    psU64 imageId, sourceId;            // Image and source identifiers
+    psS64 imageId, sourceId;            // Image and source identifiers
 } pmFPAfile;
 

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;

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

@@ -4 +4 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.9.14.1 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-12-17 02:37:03 $
+ * @version $Revision: 1.9.14.2 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-17 20:24:32 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -87 +87 @@
 
 /// Read identifiers from FITS header
-bool pmHDUReadIdentifiers(psU64 *imageId, ///< Image identifer, returned
-                          psU64 *sourceId, ///< Source identifier, returned
+bool pmHDUReadIdentifiers(psS64 *imageId, ///< Image identifer, returned
+                          psS64 *sourceId, ///< Source identifier, returned
                           const pmHDU *hdu ///< HDU from which to read
     );
@@ -94 +94 @@
 /// Write identifiers to FITS header
 bool pmHDUWriteIdentifiers(pmHDU *hdu, ///< HDU to which to write
-                           psU64 imageId, ///< Image identifer
-                           psU64 sourceId ///< Source identifier
+                           psS64 imageId, ///< Image identifer
+                           psS64 sourceId ///< Source identifier
                            );