Changeset 10257

Timestamp:

Nov 28, 2006, 4:36:07 PM (20 years ago)

Author:

magnier

Message:

updates to psMinimizeLMM functions

Location:

trunk/psModules/src

Files:

• detrend/pmShutterCorrection.c (modified) (2 diffs)
• objects/pmModelGroup.h (modified) (3 diffs)

trunk/psModules/src/detrend/pmShutterCorrection.c

@@ -301 +301 @@
 
     // XXX for the moment, don't set any constraints
-    // psMinConstrain *constrain = psMinConstrainAlloc();
-    // constrain->paramDelta = psVectorAlloc (3, PS_TYPE_F32);
-    // constrain->paramMin   = psVectorAlloc (3, PS_TYPE_F32);
-    // constrain->paramMax   = psVectorAlloc (3, PS_TYPE_F32);
-    // constrain->paramMask  = NULL;
-    psMinConstrain *constrain = NULL;   // Constraints on the minimization
+    // psMinConstraint *constraint = psMinConstraintAlloc();
+    // constrain->checkLimits = pmShutterParamLimits;
+    // constrain->paramMask   = NULL;
+    psMinConstraint *constraint = NULL;   // Constraints on the minimization
 
     // XXX ignore covariance matrix for the moment
@@ -321 +319 @@
     }
 
-    if (!psMinimizeLMChi2(minInfo, covar, params, constrain, x, counts, cntError, pmShutterCorrectionModel)) {
+    if (!psMinimizeLMChi2(minInfo, covar, params, constraint, x, counts, cntError, pmShutterCorrectionModel)) {
         psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to fit for shutter correction.\n");
         psFree(x);

trunk/psModules/src/objects/pmModelGroup.h

@@ -9 +9 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-10 02:58:43 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-29 02:36:07 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 //  This function is the model chi-square minimization function for this model.
 typedef psMinimizeLMChi2Func pmModelFunc;
+
+//  This function is the model chi-square minimization function for this model.
+typedef psMinimizeLMLimitFunc pmModelLimits;
 
 // This function returns the integrated flux for the given model parameters.
@@ -32 +35 @@
 /*  This function sets the model parameter limits vectors for the given model
  */
-typedef bool (*pmModelLimits)(psVector **beta_lim, psVector **params_min, psVector **params_max);
+// typedef bool (*pmModelLimits)(psVector **beta_lim, psVector **params_min, psVector **params_max);
 
 /*  This function provides the model guess parameters based on the details of