Changeset 25022 for branches/eam_branches/20090715/psModules/src/camera

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

• . (modified) (1 prop)
• psModules/src/camera/Makefile.am (modified) (2 diffs)
• psModules/src/camera/pmFPABin.c (modified) (1 diff)
• psModules/src/camera/pmFPAWrite.c (modified) (1 diff)
• psModules/src/camera/pmFPAfileFringeIO.c (copied) (copied from trunk/psModules/src/camera/pmFPAfileFringeIO.c )
• psModules/src/camera/pmFPAfileFringeIO.h (copied) (copied from trunk/psModules/src/camera/pmFPAfileFringeIO.h )
• psModules/src/camera/pmFPAfileIO.c (modified) (3 diffs)
• psModules/src/camera/pmReadoutStack.c (modified) (1 diff)

branches/eam_branches/20090715/psModules/src/camera/Makefile.am

@@ -23 +23 @@
         pmFPAfileIO.c \
         pmFPAfileFitsIO.c \
+        pmFPAfileFringeIO.c \
         pmFPAFlags.c \
         pmFPALevel.c \
@@ -51 +52 @@
         pmFPAfileIO.h \
         pmFPAfileFitsIO.h \
+        pmFPAfileFringeIO.h \
         pmFPAFlags.h \
         pmFPALevel.h \

branches/eam_branches/20090715/psModules/src/camera/pmFPABin.c

@@ -60 +60 @@
                         continue;
                     }
+                    if (!isfinite(inImage->data.F32[y][x])) {
+                        continue;
+                    }
                     sum += inImage->data.F32[y][x];
                     numPix++;

branches/eam_branches/20090715/psModules/src/camera/pmFPAWrite.c

@@ -741 +741 @@
     }
     if (!psFitsCompressionApply(fits, compress)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to set FITS compression to NONE");
+        psError(PS_ERR_UNKNOWN, false, "Unable to restore FITS compression");
         psFree(compress);
         return false;

branches/eam_branches/20090715/psModules/src/camera/pmFPAfileIO.c

@@ -23 +23 @@
 #include "pmFPAWrite.h"
 #include "pmFPAfileFitsIO.h"
+#include "pmFPAfileFringeIO.h"
 #include "pmSpan.h"
 #include "pmFootprint.h"
@@ -192 +193 @@
         status = pmFPAviewReadFitsImage(view, file, config);
         if (status) {
-            if (!pmFPAviewReadFitsTable(view, file, "FRINGE")) {
+            if (!pmFPAviewReadFringes(view, file)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to read fringe data from %s.\n", file->filename);
                 return false;
@@ -451 +452 @@
         status = pmFPAviewWriteFitsImage (view, file, config);
         if (status) {
-            if (!pmFPAviewWriteFitsTable(view, file, "FRINGE", config)) {
+            if (!pmFPAviewWriteFringes(view, file, config)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to write fringe data from %s.\n", file->filename);
                 return false;

branches/eam_branches/20090715/psModules/src/camera/pmReadoutStack.c

@@ -263 +263 @@
         pmCell *cell = readout->parent; // The parent cell
         bool mdok = true;       // Status of MD lookup
-        psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section
+        psRegion *trimsec = cell ? psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC") : NULL; // Trim section
         if (!mdok || !trimsec || psRegionIsNaN(*trimsec)) {
-            psWarning("CELL.TRIMSEC is not set for readout %ld --- ignored.\n", i);
+            psWarning("CELL.TRIMSEC is not set for readout %ld --- attempting to use image size.\n", i);
+            xSize = PS_MAX(xSize, readout->image->numCols);
+            ySize = PS_MAX(ySize, readout->image->numRows);
+            xMin = PS_MIN(xMin, 0);
+            xMax = PS_MAX(xMax, readout->image->numCols - 1);
+            yMin = PS_MIN(yMin, 0);
+            yMax = PS_MAX(yMax, readout->image->numRows - 1);
         } else {
             xSize = PS_MAX(xSize, trimsec->x1 - trimsec->x0);