Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotImageLoop.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotImageLoop.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/psphot/src

@@ -16 +16 @@
 polyfitTest
 growthTest
+psphotVersionDefinitions.h

@@ -16 +16 @@
 polyfitTest
 growthTest
+psphotVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/psphot/src/psphotImageLoop.c

@@ -75 +75 @@
                 }
 
+                psImageMaskType maskSat = pmConfigMaskGet("SAT", config); // Mask value for saturated pixels
+                if (!pmReadoutMaskNonfinite(readout, maskSat)) {
+                    psError(psErrorCodeLast(), false, "Unable to mask non-finite pixels.");
+                    psFree(view);
+                    return false;
+                }
+
                 // run the actual photometry analysis on this chip/cell/readout
                 if (!psphotReadout (config, view)) {

@@ -16 +16 @@
 polyfitTest
 growthTest
+psphotVersionDefinitions.h