Changeset 25754 for trunk/psModules/src/camera

Timestamp:

Oct 2, 2009, 3:11:32 PM (17 years ago)

Author:

eugene

Message:

check in changes from genes development branch : extensive changes to moments calculation, psf model generation, aperture residuals

Location:

trunk/psModules/src/camera

Files:

• pmFPARead.c (modified) (1 diff)
• pmHDUGenerate.c (modified) (3 diffs)
• pmReadoutFake.c (modified) (2 diffs, 1 prop)

trunk/psModules/src/camera/pmFPARead.c

@@ -387 +387 @@
                 psFree(regionString);
                 psFree(readout);
+                psFree(iter);
                 return false;
             }

trunk/psModules/src/camera/pmHDUGenerate.c

@@ -611 +611 @@
             if (cells->n == 0) {
                 // Nothing to do
+                psFree (cells);
                 return true;
             }
@@ -660 +661 @@
             if (cells->n == 0) {
                 // Nothing to do
+                psFree (cells);
                 return true;
             }
@@ -707 +709 @@
             if (cells->n == 0) {
                 // Nothing to do
+                psFree (cells);
                 return true;
             }
-
-            return generateHDU(hdu, cells);
+            
+            bool status = generateHDU(hdu, cells);
+            psFree (cells);
+            return status;
         }
     default:

trunk/psModules/src/camera/pmReadoutFake.c

@@ -97 +97 @@
                 continue;
             }
+            // check that all params are valid:
+            bool validParams = true;
+            for (int n = 0; validParams && (n < normModel->params->n); n++) {
+                if (n == PM_PAR_SKY) continue;
+                if (n == PM_PAR_I0) continue;
+                if (n == PM_PAR_XPOS) continue;
+                if (n == PM_PAR_YPOS) continue;
+                if (!isfinite(normModel->params->data.F32[n])) validParams = false;
+            }
+            if (!validParams) {
+                psFree(normModel);
+                continue;
+            }           
             if (circularise && !circulariseModel(normModel)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to circularise PSF model.");
@@ -112 +125 @@
             continue;
         }
+        // check that all params are valid:
+        bool validParams = true;
+        for (int n = 0; validParams && (n < fakeModel->params->n); n++) {
+            if (n == PM_PAR_SKY) continue;
+            if (n == PM_PAR_I0) continue;
+            if (n == PM_PAR_XPOS) continue;
+            if (n == PM_PAR_YPOS) continue;
+            if (!isfinite(fakeModel->params->data.F32[n])) validParams = false;
+        }
+        if (!validParams) {
+            psFree(fakeModel);
+            continue;
+        }               
         if (circularise && !circulariseModel(fakeModel)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to circularise PSF model.");