Changeset 31656 for branches/eam_branches/ipp-20110505/psLib/src/fits/psFitsImage.c

Timestamp:

Jun 21, 2011, 6:44:31 PM (15 years ago)

Author:

eugene

Message:

merge from trunk

File:

• branches/eam_branches/ipp-20110505/psLib/src/fits/psFitsImage.c (modified) (13 diffs)

branches/eam_branches/ipp-20110505/psLib/src/fits/psFitsImage.c

@@ -55 +55 @@
     int psDatatype;                     // psLib data type
     bool is_logscaled;                  // is this image log scaled using BOFFSET?
+    bool is_asinh;                      // is this image asinh scaled using BSOFTEN?
 } p_psFitsReadInfo;
 
@@ -129 +130 @@
 
     // Check scale and zero
-    double bscale = 0.0, bzero = 0.0, boffset = NAN;    // Scale and zero point
+    double bscale = 0.0, bzero = 0.0, boffset = NAN, bsoften = NAN;    // Scale and zero point
     if (fits_read_key_dbl(fits->fd, "BSCALE", &bscale, NULL, &status) && status != KEY_NO_EXIST) {
         psFitsError(status, true, "Unable to read header.");
@@ -153 +154 @@
       info->is_logscaled = false;
     }
+    status = 0;
+    if (fits_read_key_dbl(fits->fd, "BSOFTEN", &bsoften, NULL, &status) && status != KEY_NO_EXIST) {
+        psFitsError(status, true, "Unable to read header.");
+        goto bad;
+    }
+    if (status == KEY_NO_EXIST) {
+      info->is_asinh = false;
+    }
+    else if (isfinite(bsoften)) {
+      info->is_asinh = true;
+      info->is_logscaled = false;
+    }
+    else {
+      info->is_asinh = false;
+    }
+
     status = 0;
 
@@ -262 +279 @@
                                           double *bzero, // Zero point applied
                                           double *boffset, // Log offset applied
+                                          double *bsoften, // asinh offset applied
                                           long *blank, // Blank value (integer data)
                                           psFitsFloat *floatType, // Type of custom floating-point
@@ -275 +293 @@
     psAssert(bzero, "impossible");
     psAssert(boffset, "impossible");
+    psAssert(bsoften, "impossible");
     psAssert(floatType, "impossible");
     psAssert(fits, "impossible");
@@ -322 +341 @@
         if (newScaleZero) {
             // Choose an appropriate BSCALE and BZERO
-          if (!psFitsScaleDetermine(bscale, bzero, boffset, blank, image, mask, maskVal, fits)) {
+          if (!psFitsScaleDetermine(bscale, bzero, boffset, bsoften, blank, image, mask, maskVal, fits)) {
                 // We can't have the write dying for this reason --- try to save it somehow!
                 psWarning("Unable to determine BSCALE and BZERO for image --- refusing to quantise.");
@@ -348 +367 @@
         }
 
-        return psFitsScaleForDisk(image, fits, *bscale, *bzero, *boffset, rng);
+        return psFitsScaleForDisk(image, fits, *bscale, *bzero, *boffset, *bsoften, rng);
     }
 
@@ -480 +499 @@
         outImage = psFitsFloatImageFromDisk(outImage, inImage, floatType);
     }
-
     // Need to apply BOFFSET if info->is_logscaled is true
+
     if (info->is_logscaled) {
       double boffset;
@@ -487 +506 @@
       status = 0;
       fits_read_key_dbl(fits->fd, "BOFFSET", &boffset, NULL, &status);
-      psImage *newImage = psFitsScaleFromDisk(outImage,boffset);
+      psImage *newImage = psFitsScaleFromDisk(outImage,boffset,0.0);
+      psFree (outImage);
+      outImage = newImage;
+    }
+    else if (info->is_asinh) {
+      double bsoften,boffset;
+      int status;
+      status = 0;
+      fits_read_key_dbl(fits->fd, "BSOFTEN", &bsoften, NULL, &status);
+      fits_read_key_dbl(fits->fd, "BOFFSET", &boffset, NULL, &status);
+      psImage *newImage = psFitsScaleFromDisk(outImage,boffset,bsoften);
       psFree (outImage);
       outImage = newImage;
@@ -602 +631 @@
     double bscale = NAN, bzero = NAN;   // Scale and zero point to put in header
     double boffset = NAN;               // Log offset to put into header.
+    double bsoften = NAN;               // Asinh softening parameter to put into header
     long blank = 0;                     // Blank (undefined) value for image
     psFitsFloat floatType;              // Custom floating-point convention type
-    psImage *diskImage = imageToDiskRepresentation(&bscale, &bzero, &boffset, &blank, &floatType, fits, image,
+    psImage *diskImage = imageToDiskRepresentation(&bscale, &bzero, &boffset, &bsoften, &blank, &floatType, fits, image,
                                                    mask, maskVal, NULL, true); // Image to write out
     if (!diskImage) {
@@ -696 +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");
       }
     }   
@@ -727 +772 @@
                        (options->scaling == PS_FITS_SCALE_LOG_STDEV_BOTH)))) {
           fits_write_key_dbl(fits->fd, "BOFFSET", boffset, 12,
-                             "Scaling: TRUE = BZERO + BSCALE * 10**(DISK) + BOFFSET)", &status);
+                             "Scaling: ORIGINAL = 10**(TRUE) + 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;
@@ -831 +889 @@
     double bscale = NAN, bzero = NAN;   // Scale and zero point to put in header
     double boffset = NAN;               // Log offset to put in header
+    double bsoften = NAN;               // Asinh softening parameter to put in header
     long blank = 0;                     // Blank (undefined) value for image
     psFitsFloat floatType;              // Custom floating-point convention type
-    psImage *diskImage = imageToDiskRepresentation(&bscale, &bzero, &boffset, &blank, &floatType, fits, input,
+    psImage *diskImage = imageToDiskRepresentation(&bscale, &bzero, &boffset, &bsoften, &blank, &floatType, fits, input,
                                                    mask, maskVal, NULL, false); // Image to write out
     if (!diskImage) {