Changeset 10180

Timestamp:

Nov 24, 2006, 10:55:48 AM (19 years ago)

Author:

magnier

Message:

mask fitted parameters when measuring GaussNewtonDelta

File:

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

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-18 09:52:14 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-24 20:55:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -207 +207 @@
 
     // get the Gauss-Newton distance for fixed model parameters
+    // XXX I need to hold the fitted parameters fixed!
     if (paramMask != NULL) {
         psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64);
-        psMinimizeGaussNewtonDelta(delta, params, NULL, x, y, yErr, modelFunc);
+        psVector *altmask = psVectorAlloc (params->n, PS_TYPE_U8);
+        for (int i = 0; i < dparams->n; i++) {
+            if (paramMask->data.U8[i]) {
+                altmask->data.U8[i] = 0;
+            } else {
+                altmask->data.U8[i] = 1;
+            }
+        }
+        psMinimizeGaussNewtonDelta(delta, params, altmask, x, y, yErr, modelFunc);
         for (int i = 0; i < dparams->n; i++) {
             if (!paramMask->data.U8[i])
@@ -216 +225 @@
         }
         psFree (delta);
+        psFree (altmask);
     }