Changeset 30419 for branches/czw_branch/20101203/psLib/src/fits

Timestamp:

Jan 28, 2011, 3:13:28 PM (15 years ago)

Author:

watersc1

Message:

finished with logflux code, but haven't run any tests to confirm that the new stacking recipes work as designed.

Location:

branches/czw_branch/20101203/psLib/src/fits

Files:

• psFits.h (modified) (2 diffs)
• psFitsImage.c (modified) (2 diffs)
• psFitsScale.c (modified) (3 diffs)

branches/czw_branch/20101203/psLib/src/fits/psFits.h

@@ -50 +50 @@
     PS_FITS_SCALE_STDEV_NEGATIVE,       ///< Auto-scale to sample stdev, place mean at upper limit
     PS_FITS_SCALE_STDEV_BOTH,           ///< Auto-scale to sample stdev, place mean at middle
+    PS_FITS_SCALE_MANUAL,                ///< Manual scaling (use specified BSCALE and BZERO)
     PS_FITS_SCALE_LOG_RANGE,            ///< Take logarithm, Auto-scale to preserve dynamic range
     PS_FITS_SCALE_LOG_STDEV_POSITIVE,   ///< Take logarithm, Auto-scale to sample stdev, place mean at lower limit
     PS_FITS_SCALE_LOG_STDEV_NEGATIVE,   ///< Take logarithm, Auto-scale to sample stdev, place mean at upper limit
     PS_FITS_SCALE_LOG_STDEV_BOTH,       ///< Take logarithm, Auto-scale to sample stdev, place mean at middle
-
-    PS_FITS_SCALE_MANUAL                ///< Manual scaling (use specified BSCALE and BZERO)
+    PS_FITS_SCALE_LOG_MANUAL            ///< Manual scaling (use specified BSCALE, BZERO, and BOFFSET)
 } psFitsScaling;
 
@@ -71 +71 @@
     bool fuzz;                          ///< Fuzz the values when quantising floating-point values?
     double bscale, bzero;               ///< Manually specified BSCALE and BZERO (for SCALE_MANUAL)
+    double boffset;                     ///< Manually specified BOFFSET (for SCALE_MANUAL)
     double mean, stdev;                 ///< Mean and standard deviation of image
     int stdevBits;                      ///< Number of bits to sample a standard deviation (for SCALE_STDEV_*)

branches/czw_branch/20101203/psLib/src/fits/psFitsImage.c

@@ -692 +692 @@
     // Remove any BOFFSET values that exist in the header if we are not using that scaling anymore
     if (options&&(!((options->scaling == PS_FITS_SCALE_LOG_RANGE)||
+                    (options->scaling == PS_FITS_SCALE_LOG_MANUAL)||
                    (options->scaling == PS_FITS_SCALE_LOG_STDEV_POSITIVE)||
                    (options->scaling == PS_FITS_SCALE_LOG_STDEV_NEGATIVE)||
@@ -718 +719 @@
                            "Scaling: TRUE = BZERO + BSCALE * DISK", &status);
         if (options&&(((options->scaling == PS_FITS_SCALE_LOG_RANGE)||
+                       (options->scaling == PS_FITS_SCALE_LOG_MANUAL)||
                        (options->scaling == PS_FITS_SCALE_LOG_STDEV_POSITIVE)||
                        (options->scaling == PS_FITS_SCALE_LOG_STDEV_NEGATIVE)||

branches/czw_branch/20101203/psLib/src/fits/psFitsScale.c

@@ -539 +539 @@
         *bzero = options->bzero;
         break;
+      case PS_FITS_SCALE_LOG_MANUAL:
+        *bscale = options->bscale;
+        *bzero = options->bzero;
+        *boffset = options->boffset;
+        break;
       default:
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised FITS scaling method: %x",
@@ -616 +621 @@
               ps##INTYPE value; \
               if ((options->scaling == PS_FITS_SCALE_LOG_RANGE)||       \
+                (options->scaling == PS_FITS_SCALE_LOG_MANUAL)||        \
                   (options->scaling == PS_FITS_SCALE_LOG_STDEV_POSITIVE)|| \
                   (options->scaling == PS_FITS_SCALE_LOG_STDEV_NEGATIVE)|| \
@@ -756 +762 @@
     if (strcasecmp(string, "STDEV_BOTH") == 0)     return PS_FITS_SCALE_STDEV_BOTH;
     if (strcasecmp(string, "LOG_RANGE") == 0)      return PS_FITS_SCALE_LOG_RANGE;
+    if (strcasecmp(string, "LOG_MANUAL") == 0)      return PS_FITS_SCALE_LOG_MANUAL;
     if (strcasecmp(string, "LOG_STDEV_POSITIVE") == 0) return PS_FITS_SCALE_LOG_STDEV_POSITIVE;
     if (strcasecmp(string, "LOG_STDEV_NEGATIVE") == 0) return PS_FITS_SCALE_LOG_STDEV_NEGATIVE;