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

Timestamp:

Nov 17, 2006, 9:31:44 PM (20 years ago)

Author:

magnier

Message:

working on new linear fit process

File:

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

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-24 22:55:05 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-18 07:31:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
                        pmSourceFitMode mode)
 {
-    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 5, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_PTR_NON_NULL(source->moments, false);
@@ -163 +163 @@
 
     if (nPix <  nParams + 1) {
-        psTrace (".pmObjects.pmSourceFitModel", 4, "insufficient valid pixels\n");
-        psTrace("psModules.objects", 3, "---- %s(false) end ----\n", __func__);
+        psTrace ("psModules.objects", 4, "insufficient valid pixels\n");
+        psTrace ("psModules.objects", 5, "---- %s(false) end ----\n", __func__);
         model->status = PM_MODEL_BADARGS;
         psFree (x);
@@ -189 +189 @@
     psImage *covar = psImageAlloc (params->n, params->n, PS_TYPE_F64);
 
-    psTrace (".pmObjects.pmSourceFitModel", 5, "fitting function\n");
+    psTrace (__func__, 5, "fitting function\n");
 
     fitStatus = psMinimizeLMChi2(myMin, covar, params, constrain, x, y, yErr, modelFunc);
     for (int i = 0; i < dparams->n; i++) {
+        psTrace ("psModules.objects", 4, "%f ", params->data.F32[i]);
         if ((paramMask != NULL) && paramMask->data.U8[i])
             continue;
         dparams->data.F32[i] = sqrt(covar->data.F64[i][i]);
     }
+    psTrace ("psModules.objects", 4, "niter: %d, chisq: %f", myMin->iter, myMin->value);
 
     // save the resulting chisq, nDOF, nIter
@@ -245 +247 @@
 
     rc = (onPic && fitStatus);
-    psTrace("psModules.objects", 3, "---- %s(%d) end ----\n", __func__, rc);
+    psTrace("psModules.objects", 5, "---- %s(%d) end ----\n", __func__, rc);
     return(rc);
 }