Changeset 16141 for branches/pap_branch_080117/psLib/src/fits/psFitsImage.c

Timestamp:

Jan 18, 2008, 3:04:13 PM (19 years ago)

Author:

Paul Price

Message:

Moving all options on FITS I/O into an additional structure, psFitsOptions. The idea is that this can be carried around independently of the FITS structure, which is only created when opening a file.

File:

• branches/pap_branch_080117/psLib/src/fits/psFitsImage.c (modified) (7 diffs)

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

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.23.2.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-18 02:41:43 $
+ *  @version $Revision: 1.23.2.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-01-19 01:04:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -263 +263 @@
     *floatType = PS_FITS_FLOAT_NONE;
 
+    psFitsOptions *options = fits->options;
+    if (!options) {
+        return psMemIncrRefCounter((psImage*)image); // Casting away const
+    }
+
     // Custom floating-point
-    if (PS_IS_PSELEMTYPE_REAL(image->type.type) && fits->conventions.psBitpix &&
-        fits->floatType != PS_FITS_FLOAT_NONE) {
-        *floatType = fits->floatType;
-        return psFitsFloatImageToDisk(image, fits->floatType);
+    if (PS_IS_PSELEMTYPE_REAL(image->type.type) && options->conventions.psBitpix &&
+        options->floatType != PS_FITS_FLOAT_NONE) {
+        *floatType = options->floatType;
+        return psFitsFloatImageToDisk(image, options->floatType);
     }
 
     // Automatically select what we're given
-    if (fits->bitpix == 0) {
+    if (options->bitpix == 0) {
         return psMemIncrRefCounter((psImage*)image); // Casting away const
     }
 
     // Quantise floating-point images
-    if (PS_IS_PSELEMTYPE_REAL(image->type.type) && fits->bitpix > 0) {
+    if (PS_IS_PSELEMTYPE_REAL(image->type.type) && options->bitpix > 0) {
         if (newScaleZero) {
             // Choose an appropriate BSCALE and BZERO
@@ -303 +308 @@
         }
 
-        return psFitsScaleForDisk(image, fits->bitpix, *bscale, *bzero, fits->fuzz, rng);
+        return psFitsScaleForDisk(image, fits, *bscale, *bzero, rng);
     }
 
@@ -320 +325 @@
     psElemType inType = image->type.type; // Type for input image
     psElemType outType;                 // Type for output image
-    switch (fits->bitpix) {
+    switch (options->bitpix) {
         CONVERT_TYPE_INT_CASE(outType, inType, 8);
         CONVERT_TYPE_INT_CASE(outType, inType, 16);
@@ -329 +334 @@
       default:
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Target bitpix (%d) is not one of 8,16,32,64",
-                fits->bitpix);
+                options->bitpix);
         return NULL;
     }
@@ -514 +519 @@
         bzero = cfitsioBzero;
     }
-    assert(bitPix == fits->bitpix || fits->bitpix == 0);
+    psFitsOptions *options = fits->options; // FITS I/O options
+    assert(!options || bitPix == options->bitpix || options->bitpix == 0);
 
     int naxis = 3;                      // Number of axes
@@ -644 +650 @@
         bzero = cfitsioBzero;
     }
-    assert(bitPix == fits->bitpix || fits->bitpix == 0);
+    psFitsOptions *options = fits->options; // FITS I/O options
+    assert(!options || bitPix == options->bitpix || options->bitpix == 0);
 
     //check to see if the HDU has the same datatype