Changeset 25766 for branches/eam_branches/20090820/psModules/src/objects/pmSourceFitSet.c

Timestamp:

Oct 2, 2009, 5:10:19 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090820

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmSourceFitSet.c (modified) (2 diffs)

branches/eam_branches/20090820/psModules/src/objects/pmSourceFitSet.c

@@ -321 +321 @@
 
         for (int j = 0; j < model->params->n; j++, n++) {
-            if (psTraceGetLevel("psModules.objects") >= 4) {
-                fprintf (stderr, "%f ", param->data.F32[n]);
-            }
             model->params->data.F32[j] = param->data.F32[n];
             model->dparams->data.F32[j] = dparam->data.F32[n];
+            psTrace ("psModules.objects", 4, "%f +/- %f", param->data.F32[n], dparam->data.F32[n]);
         }
         psTrace ("psModules.objects", 4, " src %d", i);
@@ -483 +481 @@
 
             // 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];