Changeset 36089 for trunk/psModules

Timestamp:

Aug 31, 2013, 4:25:05 PM (13 years ago)

Author:

eugene

Message:

oops - fixed error in pmPCMsetParams

File:

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

trunk/psModules/src/objects/pmPCMdata.c

@@ -177 +177 @@
     // set parameter mask based on fitting mode
     int nParams = 0;
+    int nParAll = constraint->paramMask->n;
 
     switch (mode) {
@@ -197 +198 @@
       case PM_SOURCE_FIT_EXT:
         // fits all params except sky
-        nParams = params->n - 1;
+        nParams = nParAll - 1;
         psVectorInit (constraint->paramMask, 0);
         constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[PM_PAR_SKY] = 1;
@@ -204 +205 @@
       case PM_SOURCE_FIT_EXT_AND_SKY:
         // fits all params including sky
-        nParams = params->n;
+        nParams = nParAll;
         psVectorInit (constraint->paramMask, 0);
         break;
@@ -223 +224 @@
         psVectorInit (constraint->paramMask, 1);
         constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[PM_PAR_I0] = 0;
-        if (params->n == 7) {
+        if (nParAll == 7) {
             nParams = 1;
         } else {
@@ -234 +235 @@
         // fits all but index (PAR7) including sky
         psVectorInit (constraint->paramMask, 0);
-        if (params->n == 7) {
-            nParams = params->n;
+        if (nParAll == 7) {
+            nParams = nParAll;
         } else {
-            nParams = params->n - 1;
+            nParams = nParAll - 1;
             constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[PM_PAR_7] = 1;
         }