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

Timestamp:

Jan 22, 2008, 5:10:51 PM (18 years ago)

Author:

Paul Price

Message:

Merging pap_branch_080117 into the mainline.

File:

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

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -35 +35 @@
     }
     int value = psMetadataItemParseS32(item); // Value of interst
+    return value;
+}
+
+// Parse an option from a metadata, returning the appropriate float value
+static float parseOptionFloat(const psMetadata *md, // Metadata containing the option
+                              const char *name, // Option name
+                              const char *source // Description of source, for warning messages
+                              )
+{
+    psMetadataItem *item = psMetadataLookup(md, name); // Item with the value of interest
+    if (!item) {
+        psWarning("Unable to find value for %s in %s", name, source);
+        return NAN;
+    }
+    int value = psMetadataItemParseF32(item); // Value of interst
+    return value;
+}
+
+// Parse an option from a metadata, returning the appropriate double value
+static double parseOptionDouble(const psMetadata *md, // Metadata containing the option
+                                const char *name, // Option name
+                                const char *source // Description of source, for warning messages
+                                )
+{
+    psMetadataItem *item = psMetadataLookup(md, name); // Item with the value of interest
+    if (!item) {
+        psWarning("Unable to find value for %s in %s", name, source);
+        return NAN;
+    }
+    int value = psMetadataItemParseF64(item); // Value of interst
     return value;
 }
@@ -212 +242 @@
         psMetadata *fitsTypes = psMetadataLookupMetadata(&status, camera, "FITS"); // The FITS schemes
         if (!fitsTypes) {
-            psWarning("Unable to find FITS in camera configuration --- compression disabled.");
-            goto COMPRESSION_DONE;
+            psWarning("Unable to find FITS in camera configuration.");
+            goto FITS_OPTIONS_DONE;
         }
         psMetadata *scheme = psMetadataLookupMetadata(NULL, fitsTypes, fitsType); // FITS scheme
         if (!scheme) {
-            psWarning("Unable to find %s in FITS in camera configuration --- compression disabled.",
-                      fitsType);
-            goto COMPRESSION_DONE;
-        }
-        const char *typeString = psMetadataLookupStr(NULL, scheme, "COMP"); // Compression type
-        if (!typeString || strlen(typeString) == 0) {
-            psWarning("Can't find COMP in FITS scheme %s --- compression disabled.", fitsType);
-            goto COMPRESSION_DONE;
-        }
-        psFitsCompressionType type = psFitsCompressionTypeFromString(typeString); // Compression type enum
-
-        psString source = NULL;         // Source of options
+            psWarning("Unable to find %s in FITS in camera configuration --- will use defaults.", fitsType);
+            goto FITS_OPTIONS_DONE;
+        }
+
+        psString source = NULL;     // Source of options
         psStringAppend(&source, "%s in FITS in camera %s", fitsType, cameraName);
-        file->bitpix = parseOptionInt(scheme, "BITPIX", source, 0); // Bits per pixel
+
+        psFitsOptions *options = file->options = psFitsOptionsAlloc(); // FITS I/O options
 
         // Custom floating-point
-        const char *floatName = psMetadataLookupStr(NULL, scheme, "FLOAT"); // Name of custom floating-point
+        const char *floatName = psMetadataLookupStr(NULL, scheme, "FLOAT"); // Name of custom float
         if (floatName) {
             psString fullName = NULL;   // Full name of custom floating-point
             psStringAppend(&fullName, "FLOAT_%s", floatName);
-            file->floatType = psFitsFloatTypeFromString(fullName);
+            options->floatType = psFitsFloatTypeFromString(fullName);
             psFree(fullName);
         }
 
-        psVector *tile = psVectorAlloc(3, PS_TYPE_S32); // Tile sizes
-        tile->data.S32[0] = parseOptionInt(scheme, "TILE.X", source, 0); // Tiling in x
-        tile->data.S32[1] = parseOptionInt(scheme, "TILE.Y", source, 1); // Tiling in y
-        tile->data.S32[2] = parseOptionInt(scheme, "TILE.Z", source, 1); // Tiling in z
-        int noise = parseOptionInt(scheme, "NOISE", source, 16); // Noise bits
-        int hscale = parseOptionInt(scheme, "HSCALE", source, 0); // Scaling for HCOMPRESS
-        int hsmooth = parseOptionInt(scheme, "HSMOOTH", source, 0); // Smoothing for HCOMPRESS
+        options->bitpix = parseOptionInt(scheme, "BITPIX", source, 0); // Bits per pixel
+
+        // Scaling options
+        bool mdok;                  // Status of MD lookup
+        const char *scalingString = psMetadataLookupStr(&mdok, scheme, "SCALING"); // Scaling name
+        if (scalingString) {
+            options->scaling = psFitsScalingFromString(scalingString); // Scaling method
+
+            switch (options->scaling) {
+              case PS_FITS_SCALE_NONE:
+              case PS_FITS_SCALE_RANGE:
+                // No options required
+                break;
+              case PS_FITS_SCALE_STDEV_POSITIVE:
+              case PS_FITS_SCALE_STDEV_NEGATIVE:
+                options->stdevNum = parseOptionFloat(scheme, "STDEV.NUM", source); // Padding to edge
+                if (!isfinite(options->stdevNum)) {
+                    psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Bad value for STDEV.NUM for %s", source);
+                    psFree(source);
+                    psFree(file);
+                    return NULL;
+                }
+                // Flow through
+              case PS_FITS_SCALE_STDEV_BOTH:
+                options->stdevBits = parseOptionInt(scheme, "STDEV.BITS", source, 0); // Bits for stdev
+                if (options->stdevBits <= 0) {
+                    psError(PS_ERR_BAD_PARAMETER_VALUE, false, "Bad value for STDEV.BITS (%d) for %s",
+                            options->stdevBits, source);
+                    psFree(source);
+                    psFree(file);
+                    return NULL;
+                }
+                break;
+              case PS_FITS_SCALE_MANUAL:
+                options->bscale = parseOptionDouble(scheme, "BSCALE", source); // Scaling
+                options->bzero = parseOptionDouble(scheme, "BZERO", source); // Zero point
+                break;
+              default:
+                psAbort("Should never get here.");
+            }
+        }
+
+        // Compression options
+        const char *compressString = psMetadataLookupStr(NULL, scheme, "COMPRESSION"); // Compression type
+        if (compressString) {
+            psFitsCompressionType type = psFitsCompressionTypeFromString(compressString); // Compression
+            psVector *tile = psVectorAlloc(3, PS_TYPE_S32); // Tile sizes
+            tile->data.S32[0] = parseOptionInt(scheme, "TILE.X", source, 0); // Tiling in x
+            tile->data.S32[1] = parseOptionInt(scheme, "TILE.Y", source, 1); // Tiling in y
+            tile->data.S32[2] = parseOptionInt(scheme, "TILE.Z", source, 1); // Tiling in z
+            int noise = parseOptionInt(scheme, "NOISE", source, 16); // Noise bits
+            int hscale = 0, hsmooth = 0;// Scaling and smoothing for HCOMPRESS
+            if (type == PS_FITS_COMPRESS_HCOMPRESS) {
+                hscale = parseOptionInt(scheme, "HSCALE", source, 0);
+                hsmooth = parseOptionInt(scheme, "HSMOOTH", source, 0);
+            }
+
+            file->compression = psFitsCompressionAlloc(type, tile, noise, hscale, hsmooth);
+            psFree(tile);
+        }
+
         psFree(source);
-
-        file->compression = psFitsCompressionAlloc(type, tile, noise, hscale, hsmooth);
-        psFree(tile);
-    }
-COMPRESSION_DONE:
+    }
+ FITS_OPTIONS_DONE:
 
     file->fileLevel = pmFPAPHULevel(format);
@@ -971 +1046 @@
         }
         file->detrend = results;
-        file->fileLevel = pmFPALevelFromName(results->level);
-        if (file->fileLevel == PM_FPA_LEVEL_NONE) {
+        file->fileLevel = pmFPALevelFromName(results->level);
+        if (file->fileLevel == PM_FPA_LEVEL_NONE) {
             psError (PS_ERR_IO, false, "invalid file level for selected detrend data");
             return NULL;
@@ -1021 +1096 @@
     // inherit the concepts from the src fpa:
     pmFPACopyConcepts(file->fpa, file->src);
-    
+
     return file;
 }
@@ -1233 +1308 @@
 // pmFPAfile is being used internally.
 pmReadout *pmFPAGenerateReadout(const pmConfig *config, // configuration information
-                                const pmFPAview *view, // select background for this entry
-                                const char *name, // name of internal/external file
-                                const pmFPA *fpa, // use this fpa to generate
-                                const psImageBinning *binning) {
+                                const pmFPAview *view, // select background for this entry
+                                const char *name, // name of internal/external file
+                                const pmFPA *fpa, // use this fpa to generate
+                                const psImageBinning *binning) {
   pmReadout *readout = NULL;
 
@@ -1246 +1321 @@
     readout = pmFPAfileDefineInternal (config->files, name, binning->nXruff, binning->nYruff, PS_TYPE_F32);
     return readout;
-  } 
+  }
 
   // if the mode is INTERNAL, it has been defined in a previous call.  XXX This seems to require
@@ -1253 +1328 @@
     readout = file->readout;
     return readout;
-  } 
+  }
 
   // we are using this pmFPAfile as an I/O file: select readout or create