Changeset 22729

Timestamp:

Mar 2, 2009, 10:14:15 AM (17 years ago)

Author:

Paul Price

Message:

Since we're now writing a covariance matrix to the end of the variance image, they have no longer been identified as 'SingleCompressedImagePHU' because there's more than one extension. Realised that this is not what this function is supposed to check, but merely whether the PHU is a dummy.

Location:

trunk/psLib/src/fits

Files:

• psFitsHeader.c (modified) (3 diffs)
• psFitsHeader.h (modified) (2 diffs)
• psFitsImage.c (modified) (4 diffs)

trunk/psLib/src/fits/psFitsHeader.c

@@ -149 +149 @@
 
 
-bool psFitsCheckSingleCompressedImagePHU(const psFits *fits, psMetadata *header)
+bool psFitsCheckCompressedImagePHU(const psFits *fits, psMetadata *header)
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
@@ -163 +163 @@
     }
 
-    if (psFitsGetSize(fits) != 2) {
-        // No second extension, or multiple extensions
+    if (psFitsGetSize(fits) == 1) {
+        // No extension present
         return false;
     }
@@ -416 +416 @@
     // Explore the potential case that this is an empty PHU, and the first extension contains the sole image,
     // which is compressed.
-    if (psFitsCheckSingleCompressedImagePHU(fits, header)) {
+    if (psFitsCheckCompressedImagePHU(fits, header)) {
         // This is really what we want, not the empty PHU
         psTrace("psLib.fits", 1,

trunk/psLib/src/fits/psFitsHeader.h

@@ -20 +20 @@
 
 
-/// Determine whether the current HDU is an empty PHU with a single compressed image following.
+/// Determine whether the current HDU is an empty PHU with a compressed image following.
 ///
 /// In that case, what should be treated as an image PHU is technically an empty PHU with a binary table
@@ -26 +26 @@
 /// following compressed image to determine if this is the case.  If so, the FITS file pointer is left
 /// pointing at the compressed image.
-bool psFitsCheckSingleCompressedImagePHU(const psFits *fits, ///< FITS file pointer
-                                         const psMetadata *header ///< Header, or NULL
+bool psFitsCheckCompressedImagePHU(const psFits *fits, ///< FITS file pointer
+                                   const psMetadata *header ///< Header, or NULL
     );
 

trunk/psLib/src/fits/psFitsImage.c

@@ -219 +219 @@
     PS_ASSERT_FITS_NON_NULL(fits, NULL);
 
-    if (psFitsCheckSingleCompressedImagePHU(fits, NULL)) {
+    if (psFitsCheckCompressedImagePHU(fits, NULL)) {
         // This is really what we want, not the empty PHU
         psTrace("psLib.fits", 1,
@@ -432 +432 @@
     PS_ASSERT_INT_NONNEGATIVE(z, NULL);
 
-    if (psFitsCheckSingleCompressedImagePHU(fits, NULL)) {
+    if (psFitsCheckCompressedImagePHU(fits, NULL)) {
         // This is really what we want, not the empty PHU
         psTrace("psLib.fits", 1,
@@ -479 +479 @@
     }
 
-    if (psFitsCheckSingleCompressedImagePHU(fits, NULL)) {
+    if (psFitsCheckCompressedImagePHU(fits, NULL)) {
         // This is really what we want, not the empty PHU
         psTrace("psLib.fits", 1,
@@ -873 +873 @@
     // code replication, and should be sufficient for our needs.
 
-    if (psFitsCheckSingleCompressedImagePHU(fits, NULL)) {
+    if (psFitsCheckCompressedImagePHU(fits, NULL)) {
         // This is really what we want, not the empty PHU
         psTrace("psLib.fits", 1,