Changeset 35768 for trunk/psModules/src/camera/pmReadoutFake.c

Timestamp:

Jul 3, 2013, 2:37:22 PM (13 years ago)

Author:

eugene

Message:

deprecate KiiOpen,KiiClose (now KapaOpen,etc); major rework of psEllipse translations : use common functions pmModelAxesToParams and pmModelParamsToAxes ; use new convergence method in pmPCM_MinimizeChisq; add convergence crerition options to psMinimization; threaded versions of pmPSFtryFitEXT and pmPSFtryFitPSF

Location:

trunk/psModules

Files:

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

trunk/psModules/src/camera/pmReadoutFake.c

@@ -35 +35 @@
 #include "pmReadoutFake.h"
 
-#define MAX_AXIS_RATIO 20.0             // Maximum axis ratio for PSF model
+// XXX this is now hard-wired in pmModelParamsToAxes
+// #define MAX_AXIS_RATIO 20.0             // Maximum axis ratio for PSF model
+
 #define MODEL_MASK (PM_MODEL_STATUS_NONCONVERGE | PM_MODEL_STATUS_OFFIMAGE | \
                     PM_MODEL_STATUS_BADARGS | PM_MODEL_STATUS_LIMITS) // Mask to apply to models
@@ -52 +54 @@
 
     psF32 *params = model->params->data.F32; // Model parameters
-    psEllipseAxes axes = pmPSF_ModelToAxes(params, MAX_AXIS_RATIO, model->type); // Ellipse axes
+    psEllipseAxes axes = pmPSF_ModelToAxes(params, model->type); // Ellipse axes
     // Curiously, the minor axis can be larger than the major axis, so need to check.
     if (axes.major >= axes.minor) {