Changeset 30682 for branches/eam_branches/ipp-20110213/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Feb 17, 2011, 3:25:55 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20110213/psModules/src/camera/pmFPAfileDefine.c (modified) (3 diffs)

branches/eam_branches/ipp-20110213/psModules/src/camera/pmFPAfileDefine.c

@@ -282 +282 @@
               case PS_FITS_SCALE_NONE:
               case PS_FITS_SCALE_RANGE:
+              case PS_FITS_SCALE_LOG_RANGE:
                 // No options required
                 break;
               case PS_FITS_SCALE_STDEV_POSITIVE:
               case PS_FITS_SCALE_STDEV_NEGATIVE:
+              case PS_FITS_SCALE_LOG_STDEV_POSITIVE:
+              case PS_FITS_SCALE_LOG_STDEV_NEGATIVE:
                 options->stdevNum = parseOptionFloat(scheme, "STDEV.NUM", source); // Padding to edge
                 if (!isfinite(options->stdevNum)) {
@@ -295 +298 @@
                 // Flow through
               case PS_FITS_SCALE_STDEV_BOTH:
+              case PS_FITS_SCALE_LOG_STDEV_BOTH:
                 options->stdevBits = parseOptionInt(scheme, "STDEV.BITS", source, 0); // Bits for stdev
                 if (options->stdevBits <= 0) {
@@ -308 +312 @@
                 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:
                 psAbort("Should never get here.");