Changeset 16122 for branches/pap_branch_080117/psLib/src/fits/psFits.c

Timestamp:

Jan 17, 2008, 3:04:21 PM (19 years ago)

Author:

Paul Price

Message:

Updating FITS scaling capability (quantising floating-point images). See bug 1032. Moving scaling functions into their own file, and providing more flexibility.

File:

• branches/pap_branch_080117/psLib/src/fits/psFits.c (modified) (3 diffs)

branches/pap_branch_080117/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-12-25 01:29:42 $
+ *  @version $Revision: 1.76.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-01-18 01:04:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -165 +165 @@
     fits->conventions.compression = true;
     fits->conventions.psBitpix = true;
+
+    fits->floatType = PS_FITS_FLOAT_NONE;
     fits->bitpix = 0;
-    fits->floatType = PS_FITS_FLOAT_NONE;
+    fits->scaling = PS_FITS_SCALE_NONE;
+    fits->fuzz = true;
+    fits->bscale = 1.0;
+    fits->bzero = 0.0;
+    fits->mean = NAN;
+    fits->stdev = NAN;
+    fits->stdevBits = 8;
+    fits->stdevNum = 5.0;
+
     psMemSetDeallocator(fits,(psFreeFunc)fitsFree);
 
@@ -598 +608 @@
     // that is the restriction; data must be 32 or 64 bit for noise bits to be valid.
     if (type != PS_FITS_COMPRESS_PLIO) {
-        if (fits_set_noise_bits(fits->fd, noisebits, &status)) {
-            fits_set_compression_type(fits->fd, 0x0, &status);
-            char fitsErr[MAX_STRING_LENGTH];
-            fits_get_errstatus(status, fitsErr);
-            psError(PS_ERR_BAD_FITS, true,
-                    "Error while configuring compression. CFITSIO error: %s", fitsErr);
-            return false;
-        }
+        if (fits_set_noise_bits(fits->fd, noisebits, &status)) {
+            fits_set_compression_type(fits->fd, 0x0, &status);
+            char fitsErr[MAX_STRING_LENGTH];
+            fits_get_errstatus(status, fitsErr);
+            psError(PS_ERR_BAD_FITS, true,
+                    "Error while configuring compression. CFITSIO error: %s", fitsErr);
+            return false;
+        }
     }