Changeset 9585

Timestamp:

Oct 16, 2006, 2:41:05 PM (20 years ago)

Author:

magnier

Message:

adding MANAPLOT type to pmFPAfile

Location:

trunk/psModules/src/camera

Files:

• Makefile.am (modified) (2 diffs)
• pmFPA_JPEG.c (modified) (2 diffs)
• pmFPA_MANAPLOT.c (added)
• pmFPA_MANAPLOT.h (added)
• pmFPAfile.h (modified) (2 diffs)
• pmFPAfileIO.c (modified) (7 diffs)

trunk/psModules/src/camera/Makefile.am

@@ -17 +17 @@
         pmHDUGenerate.c \
         pmFPA_JPEG.c \
+        pmFPA_MANAPLOT.c \
         pmFPAview.c \
         pmFPAfile.c \
@@ -39 +40 @@
         pmHDUGenerate.h \
         pmFPA_JPEG.h \
+        pmFPA_MANAPLOT.h \
         pmFPAview.h \
         pmFPAfile.h \

trunk/psModules/src/camera/pmFPA_JPEG.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-25 20:23:10 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-17 00:41:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -124 +124 @@
     PS_ASSERT_PTR_NON_NULL(file, false);
 
-    switch (file->type) {
-    case PM_FPA_FILE_JPEG: {
-            // XXX we need to decide where the scale will come from in the long term
-            psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0);
-            psStats *stats = psImageBackground(readout->image, NULL, 0, 0.25, 0.75, 10000, rng);
-            psFree(rng);
+    if (file->type != PM_FPA_FILE_JPEG) {
+        psError(PS_ERR_UNKNOWN, true, "warning: type mismatch");
+        return false;
+    }
 
-            if (!isfinite(stats->robustMedian) || !isfinite(stats->robustUQ) || !isfinite(stats->robustLQ)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to measure statistics for image.\n");
-                psFree(stats);
-                return false;
-            }
-            float delta = stats->robustUQ - stats->robustLQ; // Inter-quartile range
-            float min, max;                 // Minimum and maximum for stretch
+    // XXX we need to decide where the scale will come from in the long term
+    psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0);
+    psStats *stats = psImageBackground(readout->image, NULL, 0, 0.25, 0.75, 10000, rng);
+    psFree(rng);
 
-            psString mode = pmFPAfileNameFromRule (file->extrule, file, view);
-            psString word = pmFPAfileNameFromRule (file->extxtra, file, view);
-            psArray *range = psStringSplitArray (word, ":", false);
+    if (!isfinite(stats->robustMedian) || !isfinite(stats->robustUQ) || !isfinite(stats->robustLQ)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to measure statistics for image.\n");
+        psFree(stats);
+        return false;
+    }
+    float delta = stats->robustUQ - stats->robustLQ; // Inter-quartile range
+    float min, max;                 // Minimum and maximum for stretch
 
-            if (!strcasecmp (mode, "RANGE") && range) {
-                float fmin = atof(range->data[0]);
-                float fmax = atof(range->data[1]);
-                min = stats->robustMedian + fmin*delta;
-                max = stats->robustMedian + fmax*delta;
-            } else if (!strcasecmp (mode, "FRACTION")) {
-                float fmin = atof(range->data[0]);
-                float fmax = atof(range->data[1]);
-                min = fmin*stats->robustMedian;
-                max = fmax*stats->robustMedian;
-            } else {
-                min = stats->robustMedian - 3*delta;
-                max = stats->robustMedian + 6*delta;
-            }
-            psFree(mode);
-            psFree(word);
-            psFree(range);
-            psFree(stats);
+    psString mode = pmFPAfileNameFromRule (file->extrule, file, view);
+    psString word = pmFPAfileNameFromRule (file->extxtra, file, view);
+    psArray *range = psStringSplitArray (word, ":", false);
 
-            if (!isfinite(min) || !isfinite(max)) {
-                psError(PS_ERR_UNKNOWN, true, "The stretch parameters are not both finite.\n");
-                return false;
-            }
+    if (!strcasecmp (mode, "RANGE") && range) {
+        float fmin = atof(range->data[0]);
+        float fmax = atof(range->data[1]);
+        min = stats->robustMedian + fmin*delta;
+        max = stats->robustMedian + fmax*delta;
+    } else if (!strcasecmp (mode, "FRACTION")) {
+        float fmin = atof(range->data[0]);
+        float fmax = atof(range->data[1]);
+        min = fmin*stats->robustMedian;
+        max = fmax*stats->robustMedian;
+    } else {
+        min = stats->robustMedian - 3*delta;
+        max = stats->robustMedian + 6*delta;
+    }
+    psFree(mode);
+    psFree(word);
+    psFree(range);
+    psFree(stats);
 
-            psString name = pmFPAfileNameFromRule (file->filerule, file, view);
-            psString mapname = pmFPAfileNameFromRule (file->filextra, file, view);
-            psImageJpegColormap *map = psImageJpegColormapSet (NULL, mapname);
-            psFree(mapname);
-            if (!map) {
-                map = psImageJpegColormapSet (NULL, "-greyscale");
-            }
+    if (!isfinite(min) || !isfinite(max)) {
+        psError(PS_ERR_UNKNOWN, true, "The stretch parameters are not both finite.\n");
+        return false;
+    }
 
-            psImageJpeg (map, readout->image, name, min, max);
-            psFree(name);
-            psFree(map);
+    psString name = pmFPAfileNameFromRule (file->filerule, file, view);
+    psString mapname = pmFPAfileNameFromRule (file->filextra, file, view);
+    psImageJpegColormap *map = psImageJpegColormapSet (NULL, mapname);
+    psFree(mapname);
+    if (!map) {
+        map = psImageJpegColormapSet (NULL, "-greyscale");
+    }
 
-            return true;
-        }
-    default:
-        fprintf (stderr, "warning: type mismatch\n");
-        break;
-    }
-    return false;
+    psImageJpeg (map, readout->image, name, min, max);
+    psFree(name);
+    psFree(map);
+
+    return true;
 }

trunk/psModules/src/camera/pmFPAfile.h

@@ -7 +7 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-28 19:22:11 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-17 00:41:05 $
 *
 *  Copyright 2004-2005 Institute for Astronomy, University of Hawaii
@@ -36 +36 @@
     PM_FPA_FILE_PSF,
     PM_FPA_FILE_JPEG,
+    PM_FPA_FILE_MANAPLOT,
 } pmFPAfileType;
 

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -27 +27 @@
 #include "pmPSF_IO.h"
 #include "pmFPA_JPEG.h"
-# include "pmDetrendDB.h"
+#include "pmFPA_MANAPLOT.h"
+#include "pmDetrendDB.h"
 
 // open file (if not already opened)
@@ -232 +233 @@
     case PM_FPA_FILE_PSF:
     case PM_FPA_FILE_JPEG:
+    case PM_FPA_FILE_MANAPLOT:
         psTrace ("pmFPAfile", 5, "defer opening %s\n", file->filename);
         break;
@@ -315 +317 @@
 
     case PM_FPA_FILE_JPEG:
+    case PM_FPA_FILE_MANAPLOT:
         break;
 
@@ -375 +378 @@
     case PM_FPA_FILE_PSF:
     case PM_FPA_FILE_JPEG:
+    case PM_FPA_FILE_MANAPLOT:
         break;
 
@@ -454 +458 @@
     case PM_FPA_FILE_JPEG:
         pmFPAviewWriteJPEG (view, file);
-        psTrace ("pmFPAfile", 5, "wrote PSF %s (fpa: %p)\n", file->filename, file->fpa);
+        psTrace ("pmFPAfile", 5, "wrote JPEG %s (fpa: %p)\n", file->filename, file->fpa);
+        break;
+
+    case PM_FPA_FILE_MANAPLOT:
+        pmFPAviewWriteMANAPLOT (view, file);
+        psTrace ("pmFPAfile", 5, "wrote MANAPLOT %s (fpa: %p)\n", file->filename, file->fpa);
         break;
 
@@ -517 +526 @@
     case PM_FPA_FILE_PSF:
     case PM_FPA_FILE_JPEG:
+    case PM_FPA_FILE_MANAPLOT:
         break;
 
@@ -573 +583 @@
     case PM_FPA_FILE_PSF:
     case PM_FPA_FILE_JPEG:
+    case PM_FPA_FILE_MANAPLOT:
         break;