Changeset 15335

Timestamp:

Oct 19, 2007, 1:52:39 PM (19 years ago)

Author:

Paul Price

Message:

Adding psFitsFloat.[ch] for quantising (and unquantising) floating-point images and setting BSCALE and BZERO. It isn't in a usable state yet, but checking in to the tree for safety. It's not activate in the build.

Location:

trunk/psLib/src/fits

Files:

• Makefile.am (modified) (2 diffs)
• psFits.c (modified) (6 diffs)
• psFits.h (modified) (2 diffs)
• psFitsFloat.c (added)
• psFitsFloat.h (added)
• psFitsHeader.c (modified) (3 diffs)
• psFitsImage.c (modified) (7 diffs)
• psFitsImage.h (modified) (2 diffs)

trunk/psLib/src/fits/Makefile.am

@@ -9 +9 @@
         psFitsImage.c \
         psFitsTable.c
+#       psFitsFloat.c
 
 EXTRA_DIST = fits.i
@@ -17 +18 @@
         psFitsImage.h \
         psFitsTable.h
+#       psFitsFloat.h
 
 CLEANFILES = *~ *.bb *.bbg *.da

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-03 21:27:21 $
+ *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-19 23:52:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -163 +163 @@
     fits->extword = NULL;
     fits->conventions.compression = true;
+    fits->conventions.psBitpix = true;
+    fits->bscale = 0.0;
+    fits->bzero = 0.0;
     psMemSetDeallocator(fits,(psFreeFunc)fitsFree);
 
@@ -397 +400 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
-
-    if (! fits->writable) {
-        psError(PS_ERR_IO, true,
-                _("The psFits object is not writable."));
-        return false;
-    }
+    PS_ASSERT_FITS_WRITABLE(fits, false);
 
     // move to the specified HDU
@@ -431 +429 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
     PS_ASSERT_STRING_NON_EMPTY(extname, false);
-
-    if (! fits->writable) {
-        psError(PS_ERR_IO, true,
-                _("The psFits object is not writable."));
-        return false;
-    }
 
     // move to the specified HDU
@@ -509 +502 @@
 bool psFitsTruncate(psFits* fits)
 {
-    PS_ASSERT_FITS_NON_NULL(fits, NULL);
-
-    if (! fits->writable) {
-        psError(PS_ERR_IO, true,
-                _("The psFits object is not writable."));
-        return PS_FITS_TYPE_NONE;
-    }
+    PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
 
     int newEnd = psFitsGetExtNum(fits);
@@ -547 +535 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
 
     // convert psFitsCompressionType to cfitsio compression types

trunk/psLib/src/fits/psFits.h

@@ -4 +4 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-10-09 03:00:05 $
+ * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-10-19 23:52:39 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -57 +57 @@
     struct {
         bool compression;               ///< Compression convention: handling of compressed images
+        bool psBitpix;                  ///< Pan-STARRS BITPIX for floating-point conversion
     } conventions;                      ///< Conventions to honour
+    double bscale;                      ///< Scaling to apply when reading FITS data; 0 for auto
+    double bzero;                       ///< Zero point to apply when reading FITS data; auto if bscale = 0
 } psFits;
 

trunk/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-04 01:16:33 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-19 23:52:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -593 +593 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
     PS_ASSERT_METADATA_NON_NULL(output, false);
 
@@ -604 +605 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
 
     // We allow output == NULL in order to write a minimal header.

trunk/psLib/src/fits/psFitsImage.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-10-03 21:27:21 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-10-19 23:52:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -185 +185 @@
 }
 
+
+bool psFitsImageSize(int *numCols, int *numRows, psElemType *type, const psFits *fits, psRegion region)
+{
+    PS_ASSERT_FITS_NON_NULL(fits, NULL);
+
+    if (psFitsCheckSingleCompressedImagePHU(fits, NULL)) {
+        // This is really what we want, not the empty PHU
+        psTrace("psLib.fits", 1,
+                "This PHU should really be a compressed image --- reading that image instead.");
+    }
+
+    p_psFitsReadInfo *info = p_psFitsReadInfoAlloc(fits, region, 0); // How big the region to read is
+
+    if (numCols) {
+        *numCols = info->lastPixel[0] - info->firstPixel[0] + 1;
+    }
+    if (numRows) {
+        *numRows = info->lastPixel[1] - info->firstPixel[1] + 1;
+    }
+    if (type) {
+        *type = info->psDatatype;
+    }
+
+    psFree(info);
+
+    return true;
+}
+
+
 // Read into an extant image of just the right size
 static bool fitsReadImage(psImage *output,   // Output image
@@ -287 +316 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
     PS_ASSERT_IMAGE_NON_NULL(input, false);
     // this is equivalent to insert after the last HDU
@@ -302 +332 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
     PS_ASSERT_IMAGE_NON_NULL(input, false);
 
@@ -402 +433 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
     PS_ASSERT_IMAGE_NON_NULL(input, false);
 
@@ -556 +588 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
     PS_ASSERT_ARRAY_NON_NULL(input, false);
 
@@ -622 +655 @@
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
+    PS_ASSERT_FITS_WRITABLE(fits, false);
     PS_ASSERT_ARRAY_NON_NULL(input, false);
 

trunk/psLib/src/fits/psFitsImage.h

@@ -4 +4 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-01-23 22:47:23 $
+ * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-10-19 23:52:39 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -21 +21 @@
 #include "psMetadata.h"
 #include "psImage.h"
+
+/// Return the dimensions and type of the FITS image
+bool psFitsImageSize(int *numCols, int *numRows, ///< Size of image
+                     psElemType *type,  ///< Type of image
+                     const psFits *fits, ///< FITS file pointer
+                     psRegion region    ///< Region in the FITS image to read
+    );
 
 /** Reads an image, given the desired region and z-plane.