Changeset 31621 for branches/czw_branch/20110406/psLib/src/fits/psFitsImage.c

Timestamp:

Jun 13, 2011, 3:52:49 PM (15 years ago)

Author:

watersc1

Message:

asinh scaling. Both writing and reading seem to function as expected, so I'm calling it done.

File:

• branches/czw_branch/20110406/psLib/src/fits/psFitsImage.c (modified) (4 diffs)

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

@@ -164 +164 @@
     else if (isfinite(bsoften)) {
       info->is_asinh = true;
+      info->is_logscaled = false;
     }
     else {
@@ -510 +511 @@
     }
     else if (info->is_asinh) {
-      double bsoften;
+      double bsoften,boffset;
       int status;
       status = 0;
       fits_read_key_dbl(fits->fd, "BSOFTEN", &bsoften, NULL, &status);
-      psImage *newImage = psFitsScaleFromDisk(outImage,0.0,bsoften);
+      fits_read_key_dbl(fits->fd, "BOFFSET", &boffset, NULL, &status);
+      psImage *newImage = psFitsScaleFromDisk(outImage,boffset,bsoften);
       psFree (outImage);
       outImage = newImage;
@@ -724 +726 @@
     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)||
-                   (options->scaling == PS_FITS_SCALE_LOG_STDEV_BOTH)))) {
+                    (options->scaling == PS_FITS_SCALE_LOG_STDEV_POSITIVE)||
+                    (options->scaling == PS_FITS_SCALE_LOG_STDEV_NEGATIVE)||
+                    (options->scaling == PS_FITS_SCALE_LOG_STDEV_BOTH)||
+                    (options->scaling == PS_FITS_SCALE_ASINH_RANGE)||
+                    (options->scaling == PS_FITS_SCALE_ASINH_MANUAL)||
+                    (options->scaling == PS_FITS_SCALE_ASINH_STDEV_POSITIVE)||
+                    (options->scaling == PS_FITS_SCALE_ASINH_STDEV_NEGATIVE)||
+                    (options->scaling == PS_FITS_SCALE_ASINH_STDEV_BOTH)))) {
       if (psMetadataLookup(header,"BOFFSET")) {
         psMetadataRemoveKey(header,"BOFFSET");
+      }
+    }   
+    // Remove any BSOFTENvalues that exist in the header if we are not using that scaling anymore
+    if (options&&(!((options->scaling == PS_FITS_SCALE_ASINH_RANGE)||
+                    (options->scaling == PS_FITS_SCALE_ASINH_MANUAL)||
+                    (options->scaling == PS_FITS_SCALE_ASINH_STDEV_POSITIVE)||
+                    (options->scaling == PS_FITS_SCALE_ASINH_STDEV_NEGATIVE)||
+                    (options->scaling == PS_FITS_SCALE_ASINH_STDEV_BOTH)))) {
+      if (psMetadataLookup(header,"BSOFTEN")) {
+        psMetadataRemoveKey(header,"BSOFTEN");
       }
     }   
@@ -757 +774 @@
                              "Scaling: TRUE = BZERO + BSCALE * 10**(DISK) + BOFFSET)", &status);
         }       
+        if (options&&(((options->scaling == PS_FITS_SCALE_ASINH_RANGE)||
+                       (options->scaling == PS_FITS_SCALE_ASINH_MANUAL)||
+                       (options->scaling == PS_FITS_SCALE_ASINH_STDEV_POSITIVE)||
+                       (options->scaling == PS_FITS_SCALE_ASINH_STDEV_NEGATIVE)||
+                       (options->scaling == PS_FITS_SCALE_ASINH_STDEV_BOTH)))) {
+          fits_write_key_dbl(fits->fd, "BOFFSET", boffset, 12,
+                             "Scaling: NORM = DISK + BOFFSET", &status);
+          fits_write_key_dbl(fits->fd, "BSOFTEN", bsoften, 12,
+                             "Scaling: TRUE = 2 * BSOFTEN * sinh(NORM/a)",&status);
+
+
+        }       
+
         if (psFitsError(status, true, "Could not write BSCALE/BZERO headers to file.")) {
             success = false;