Changeset 31633 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Jun 15, 2011, 6:09:25 PM (15 years ago)

Author:

watersc1

Message:

merge from czw branch: ASINH code

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -283 +283 @@
               case PS_FITS_SCALE_RANGE:
               case PS_FITS_SCALE_LOG_RANGE:
+              case PS_FITS_SCALE_ASINH_RANGE:
                 // No options required
                 break;
@@ -289 +290 @@
               case PS_FITS_SCALE_LOG_STDEV_POSITIVE:
               case PS_FITS_SCALE_LOG_STDEV_NEGATIVE:
+              case PS_FITS_SCALE_ASINH_STDEV_POSITIVE:
+              case PS_FITS_SCALE_ASINH_STDEV_NEGATIVE:
                 options->stdevNum = parseOptionFloat(scheme, "STDEV.NUM", source); // Padding to edge
                 if (!isfinite(options->stdevNum)) {
@@ -299 +302 @@
               case PS_FITS_SCALE_STDEV_BOTH:
               case PS_FITS_SCALE_LOG_STDEV_BOTH:
+              case PS_FITS_SCALE_ASINH_STDEV_BOTH:
                 options->stdevBits = parseOptionInt(scheme, "STDEV.BITS", source, 0); // Bits for stdev
                 if (options->stdevBits <= 0) {
@@ -312 +316 @@
                 options->bzero = parseOptionDouble(scheme, "BZERO", source); // Zero point
                 break;
-            case PS_FITS_SCALE_LOG_MANUAL:
-              options->bscale = parseOptionDouble(scheme, "BSCALE", source); // Scaling
-              options->bzero = parseOptionDouble(scheme, "BZERO", source); // Zero point
-              options->boffset = parseOptionDouble(scheme, "BOFFSET", source); // Log offset
-              break;          
-              default:
+              case PS_FITS_SCALE_LOG_MANUAL:
+                options->bscale = parseOptionDouble(scheme, "BSCALE", source); // Scaling
+                options->bzero = parseOptionDouble(scheme, "BZERO", source); // Zero point
+                options->boffset = parseOptionDouble(scheme, "BOFFSET", source); // Log offset
+              case PS_FITS_SCALE_ASINH_MANUAL:
+                options->bscale = parseOptionDouble(scheme, "BSCALE", source); // Scaling
+                options->bzero = parseOptionDouble(scheme, "BZERO", source); // Zero point
+                options->boffset = parseOptionDouble(scheme, "BOFFSET", source); // Log offset
+                options->bsoften = parseOptionDouble(scheme, "BSOFTEN", source); // Softening parameter
+                break;        
+              default:
                 psAbort("Should never get here.");
             }