Changeset 16131 for branches/pap_branch_080117/psLib/src/fits/psFitsScale.c

Timestamp:

Jan 17, 2008, 5:37:50 PM (19 years ago)

Author:

Paul Price

Message:

Renaming STDEV_LOWER, STDEV_UPPER, STDEV_MIDDLE --> STDEV_POSITIVE, STDEV_NEGATIVE, STDEV_BOTH. This indicates the kind of image directly, rather than a technical property of the image.

File:

• branches/pap_branch_080117/psLib/src/fits/psFitsScale.c (modified) (4 diffs)

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

@@ -113 +113 @@
 
     long range = 1 << fits->stdevBits;  // Range of values to carry standard deviation
-    *bscale = fits->stdev / (double) range;
+    *bscale = stdev / (double) range;
 
     int bitpix = fits->bitpix;          // Bits per pixel
@@ -119 +119 @@
     long diskVal;                       // Corresponding value on disk
     switch (fits->scaling) {
-      case PS_FITS_SCALE_STDEV_LOWER:
+      case PS_FITS_SCALE_STDEV_POSITIVE:
         // Put (mean - N sigma) at the lowest possible value: predominantly positive images
         imageVal = mean - fits->stdevNum * stdev;
         diskVal = - (1 << (bitpix - 1));
         break;
-      case PS_FITS_SCALE_STDEV_UPPER:
+      case PS_FITS_SCALE_STDEV_NEGATIVE:
         // Put (mean + N sigma) at the highest possible value: predominantly negative images
         imageVal = mean + fits->stdevNum * stdev;
         diskVal = (1 << (bitpix - 1)) - 1;
         break;
-      case PS_FITS_SCALE_STDEV_MIDDLE:
+      case PS_FITS_SCALE_STDEV_BOTH:
         // Put mean right in the middle: images with an equal abundance of positive and negative values
         imageVal = mean;
@@ -165 +165 @@
     // If we don't have a RNG, we will allocate one
 
-    if (fits->scaling != PS_FITS_SCALE_STDEV_LOWER &&
-        fits->scaling != PS_FITS_SCALE_STDEV_UPPER &&
-        fits->scaling != PS_FITS_SCALE_STDEV_MIDDLE) {
+    if (fits->scaling != PS_FITS_SCALE_STDEV_POSITIVE &&
+        fits->scaling != PS_FITS_SCALE_STDEV_NEGATIVE &&
+        fits->scaling != PS_FITS_SCALE_STDEV_BOTH) {
         // No need to do anything
         return true;
@@ -238 +238 @@
         }
         break;
-      case PS_FITS_SCALE_STDEV_LOWER:
-      case PS_FITS_SCALE_STDEV_UPPER:
-      case PS_FITS_SCALE_STDEV_MIDDLE:
+      case PS_FITS_SCALE_STDEV_POSITIVE:
+      case PS_FITS_SCALE_STDEV_NEGATIVE:
+      case PS_FITS_SCALE_STDEV_BOTH:
         if (!scaleStdev(bscale, bzero, image, fits)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to set BSCALE and BZERO from stdev");