Changeset 16672

Timestamp:

Feb 26, 2008, 2:35:41 PM (18 years ago)

Author:

Paul Price

Message:

Trying to make the scaling of floating-point images a bit more robust. We don't want a write dying because it can't determine a suitable BSCALE and BZERO --- we need to save the write somehow, anyhow! So, if in doubt, use 1 and 0.

Location:

trunk/psLib/src/fits

Files:

• psFitsImage.c (modified) (2 diffs)
• psFitsScale.c (modified) (1 diff)

trunk/psLib/src/fits/psFitsImage.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-23 03:08:03 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-02-27 00:35:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -285 +285 @@
             // Choose an appropriate BSCALE and BZERO
             if (!psFitsScaleDetermine(bscale, bzero, image, fits)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to determine BSCALE and BZERO for image.");
-                return NULL;
+                // We can't have the write dying for this reason --- try to save it somehow!
+                psWarning("Unable to determine BSCALE and BZERO for image --- setting to 1.0, 0.0");
+                psErrorStackClear();
             }
         } else {

trunk/psLib/src/fits/psFitsScale.c

@@ -288 +288 @@
         for (int y = 0; y < numRows; y++) { \
             for (int x = 0; x < numCols; x++) { \
-                ps##INTYPE value = ((IN)->data.INTYPE[y][x] - zero) * scale; \
-                if (options->fuzz) { \
-                   /* Add random factor [0,1): adds a variance of 1/12, */ \
-                   /* but preserves the expectation value */ \
-                    value += psRandomUniform(rng); \
+                ps##INTYPE value = (IN)->data.INTYPE[y][x]; \
+                if (!isfinite(value)) { \
+                    /* This choice of "max" for non-finite pixels is mainly cosmetic --- it has to be */ \
+                    /* something, and "min" would produce holes in the cores of bright stars. */ \
+                    (OUT)->data.OUTTYPE[y][x] = max; \
+                } else { \
+                    value = (value - zero) * scale; \
+                    if (options->fuzz) { \
+                       /* Add random factor [0,1): adds a variance of 1/12, */ \
+                       /* but preserves the expectation value */ \
+                        value += psRandomUniform(rng); \
+                    } \
+                    /* Check for underflow and overflow */ \
+                    (OUT)->data.OUTTYPE[y][x] = (value < min ? min : (value > max ? max : value)); \
                 } \
-                /* Check for underflow and overflow */ \
-                (OUT)->data.OUTTYPE[y][x] = (value < min ? min : (value > max ? max : value)); \
             } \
         } \