Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/camera/pmReadoutFake.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmReadoutFake.c (modified) (3 diffs)

branches/meh_branches/ppstack_test/psModules/src/camera/pmReadoutFake.c

@@ -51 +51 @@
 
     psF32 *params = model->params->data.F32; // Model parameters
-    psEllipseAxes axes = pmPSF_ModelToAxes(params, MAX_AXIS_RATIO); // Ellipse axes
+    psEllipseAxes axes = pmPSF_ModelToAxes(params, MAX_AXIS_RATIO, model->type); // Ellipse axes
     // Curiously, the minor axis can be larger than the major axis, so need to check.
     if (axes.major >= axes.minor) {
@@ -58 +58 @@
         axes.major = axes.minor;
     }
-    return pmPSF_AxesToModel(params, axes);
+    return pmPSF_AxesToModel(params, axes, model->type);
 }
 
@@ -314 +314 @@
                 }
             }
-            if (!psThreadPoolWait(true)) {
+            if (!psThreadPoolWait(true, true)) {
                 psError(PS_ERR_UNKNOWN, false, "Error waiting for threads.");
                 psFree(groups);