Changeset 25754 for trunk/psModules/src/objects/pmSourceFitModel.c

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

File:

• trunk/psModules/src/objects/pmSourceFitModel.c (modified) (3 diffs)

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -96 +96 @@
 
             // Convert i/j to image space:
-            coord->data.F32[0] = (psF32) (j + source->pixels->col0);
-            coord->data.F32[1] = (psF32) (i + source->pixels->row0);
+            // 0.5 PIX: the coordinate values must be in pixel coords, not index            
+            coord->data.F32[0] = (psF32) (j + 0.5 + source->pixels->col0);
+            coord->data.F32[1] = (psF32) (i + 0.5 + source->pixels->row0);
             x->data[nPix] = (psPtr *) coord;
             y->data.F32[nPix] = source->pixels->data.F32[i][j];
@@ -175 +176 @@
             continue;
         dparams->data.F32[i] = sqrt(covar->data.F32[i][i]);
-        if (psTraceGetLevel("psModules.objects") >= 4) {
-            fprintf (stderr, "%f +/- %f\n", params->data.F32[i], dparams->data.F32[i]);
-        }
+        psTrace ("psModules.objects", 4, "%f +/- %f", params->data.F32[i], dparams->data.F32[i]);
     }
     psTrace ("psModules.objects", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);
@@ -186 +185 @@
     model->nPix  = y->n;
     model->nDOF  = y->n - nParams;
+    model->chisqNorm = model->chisq / model->nDOF;
     model->flags |= PM_MODEL_STATUS_FITTED;
     if (!fitStatus) model->flags |= PM_MODEL_STATUS_NONCONVERGE;