Changeset 35768 for trunk/psModules/src/objects/pmPSFtryMakePSF.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/objects/pmPSFtryMakePSF.c (modified) (2 diffs)

trunk/psModules/src/objects/pmPSFtryMakePSF.c

@@ -165 +165 @@
 
             for (int i = 0; i < psf->params->n; i++) {
-                if (psf->params->data[i] == NULL) {
-                    psFree(modelPSF);
-                    continue;
-                }
+                if (psf->params->data[i] == NULL) continue;
                 fprintf (f, "%f %f : ", source->modelEXT->params->data.F32[i], modelPSF->params->data.F32[i]);
             }
@@ -214 +211 @@
         assert (source->modelEXT); // all unmasked sources should have modelEXT
 
-        psEllipsePol pol = pmPSF_ModelToFit (source->modelEXT->params->data.F32);
+        bool useReff = pmModelUseReff (source->modelEXT->type);
+        psEllipsePol pol = pmPSF_ModelToFit (source->modelEXT->params->data.F32, useReff);
 
         e0->data.F32[i] = pol.e0;