Changeset 31244

Timestamp:

Apr 8, 2011, 2:09:11 PM (15 years ago)

Author:

watersc1

Message:

Fixes bug between writing covariance extension and the log scaled/compressed stack images.

File:

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

trunk/psModules/src/camera/pmFPAWrite.c

@@ -690 +690 @@
     pmHDU *hdu = pmHDUFromCell(cell);   // HDU for cell
     psMetadata *header = psMetadataCopy(NULL, hdu->header); // Header to write
+
     psMetadataAddS32(header, PS_LIST_TAIL, "COVARIANCE.CENTRE.X", PS_META_REPLACE,
                      "Centre of covariance matrix in x", -xMinCovar);
@@ -697 +698 @@
     // Turn off compression
     int bitpix = fits->options ? fits->options->bitpix : 0; // Desired bits per pixel
+    psFitsScaling scaling = fits->options ? fits->options->scaling : 0; // Current scaling method.
     psFitsCompression *compress = psFitsCompressionGet(fits); // Current compression options
+    
+/*     fprintf(stderr,"Attempting to write chip %s cell %s extension %s with scaling %d\n", */
+/*          chipName,cellName,extname,fits->options->scaling); */
     if (!psFitsSetCompression(fits, PS_FITS_COMPRESS_NONE, NULL, 0, 0, 0)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to set FITS compression to NONE");
@@ -708 +713 @@
     if (fits->options) {
         fits->options->bitpix = 0;
+    }
+    if (fits->options) {
+        fits->options->scaling = psFitsScalingFromString("STDEV_POSITIVE"); // This is a bit of a hack. We don't really have a default value.
     }
 
@@ -732 +740 @@
         fits->options->bitpix = bitpix;
     }
+    if (fits->options) {
+        fits->options->scaling = scaling;
+    }
     if (!psFitsCompressionApply(fits, compress)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to restore FITS compression");