Index: trunk/psphot/src/models/pmModel_TEST1.c
===================================================================
--- trunk/psphot/src/models/pmModel_TEST1.c	(revision 15000)
+++ trunk/psphot/src/models/pmModel_TEST1.c	(revision 15843)
@@ -16,10 +16,10 @@
  *****************************************************************************/
 
-# define PM_MODEL_FUNC       	  pmModelFunc_TEST1
-# define PM_MODEL_FLUX       	  pmModelFlux_TEST1
-# define PM_MODEL_GUESS      	  pmModelGuess_TEST1
-# define PM_MODEL_LIMITS     	  pmModelLimits_TEST1
-# define PM_MODEL_RADIUS     	  pmModelRadius_TEST1
-# define PM_MODEL_FROM_PSF   	  pmModelFromPSF_TEST1
+# define PM_MODEL_FUNC            pmModelFunc_TEST1
+# define PM_MODEL_FLUX            pmModelFlux_TEST1
+# define PM_MODEL_GUESS           pmModelGuess_TEST1
+# define PM_MODEL_LIMITS          pmModelLimits_TEST1
+# define PM_MODEL_RADIUS          pmModelRadius_TEST1
+# define PM_MODEL_FROM_PSF        pmModelFromPSF_TEST1
 # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_TEST1
 # define PM_MODEL_FIT_STATUS      pmModelFitStatus_TEST1
@@ -27,6 +27,6 @@
 // the model is a function of the pixel coordinate (pixcoord[0,1] = x,y)
 psF32 PM_MODEL_FUNC(psVector *deriv,
-		    const psVector *params,
-		    const psVector *pixcoord)
+                    const psVector *params,
+                    const psVector *pixcoord)
 {
     psF32 *PAR = params->data.F32;
@@ -57,5 +57,5 @@
 
 // define the parameter limits
-bool PM_MODEL_LIMITS (psMinConstraintMode mode, int nParam, float *params, float *beta) 
+bool PM_MODEL_LIMITS (psMinConstraintMode mode, int nParam, float *params, float *beta)
 {
     float beta_lim = 0;
@@ -65,56 +65,56 @@
     switch (mode) {
       case PS_MINIMIZE_BETA_LIMIT:
-	switch (nParam) {
-	  case PM_PAR_SKY:  beta_lim = 1000;  break;
-	  case PM_PAR_I0:   beta_lim = 3e6;   break;
-	  case PM_PAR_XPOS: beta_lim = 5;     break;
-	  case PM_PAR_YPOS: beta_lim = 5;     break;
-	  case PM_PAR_SXX:  beta_lim = 0.5;   break;
-	  case PM_PAR_SYY:  beta_lim = 0.5;   break;
-	  case PM_PAR_SXY:  beta_lim = 0.5;   break;
-	  default:
-	    psAbort("invalid parameter %d for beta test", nParam);
-	}
-	if (fabs(beta[nParam]) > fabs(beta_lim)) {
-	    beta[nParam] = (beta[nParam] > 0) ? fabs(beta_lim) : -fabs(beta_lim);
-	    return false;
-	}
-	return true;
+        switch (nParam) {
+          case PM_PAR_SKY:  beta_lim = 1000;  break;
+          case PM_PAR_I0:   beta_lim = 3e6;   break;
+          case PM_PAR_XPOS: beta_lim = 5;     break;
+          case PM_PAR_YPOS: beta_lim = 5;     break;
+          case PM_PAR_SXX:  beta_lim = 0.5;   break;
+          case PM_PAR_SYY:  beta_lim = 0.5;   break;
+          case PM_PAR_SXY:  beta_lim = 0.5;   break;
+          default:
+            psAbort("invalid parameter %d for beta test", nParam);
+        }
+        if (fabs(beta[nParam]) > fabs(beta_lim)) {
+            beta[nParam] = (beta[nParam] > 0) ? fabs(beta_lim) : -fabs(beta_lim);
+            return false;
+        }
+        return true;
       case PS_MINIMIZE_PARAM_MIN:
-	switch (nParam) {
-	  case PM_PAR_SKY:  params_min = -1000; break;
-	  case PM_PAR_I0:   params_min =     0; break;
-	  case PM_PAR_XPOS: params_min =  -100; break;
-	  case PM_PAR_YPOS: params_min =  -100; break;
-	  case PM_PAR_SXX:  params_min =   0.5; break;
-	  case PM_PAR_SYY:  params_min =   0.5; break;
-	  case PM_PAR_SXY:  params_min =  -5.0; break;
-	  default:
-	    psAbort("invalid parameter %d for param min test", nParam);
-	}
-	if (params[nParam] < params_min) {
-	    params[nParam] = params_min;
-	    return false;
-	}
-	return true;
+        switch (nParam) {
+          case PM_PAR_SKY:  params_min = -1000; break;
+          case PM_PAR_I0:   params_min =     0; break;
+          case PM_PAR_XPOS: params_min =  -100; break;
+          case PM_PAR_YPOS: params_min =  -100; break;
+          case PM_PAR_SXX:  params_min =   0.5; break;
+          case PM_PAR_SYY:  params_min =   0.5; break;
+          case PM_PAR_SXY:  params_min =  -5.0; break;
+          default:
+            psAbort("invalid parameter %d for param min test", nParam);
+        }
+        if (params[nParam] < params_min) {
+            params[nParam] = params_min;
+            return false;
+        }
+        return true;
       case PS_MINIMIZE_PARAM_MAX:
-	switch (nParam) {
-	  case PM_PAR_SKY:  params_max =   1e5; break;
-	  case PM_PAR_I0:   params_max =   1e8; break;
-	  case PM_PAR_XPOS: params_max =   1e4; break;
-	  case PM_PAR_YPOS: params_max =   1e4; break;
-	  case PM_PAR_SXX:  params_max =   100; break;
-	  case PM_PAR_SYY:  params_max =   100; break;
-	  case PM_PAR_SXY:  params_max =  +5.0; break;
-	  default:
-	    psAbort("invalid parameter %d for param max test", nParam);
-	}
-	if (params[nParam] > params_max) {
-	    params[nParam] = params_max;
-	    return false;
-	}
-	return true;
+        switch (nParam) {
+          case PM_PAR_SKY:  params_max =   1e5; break;
+          case PM_PAR_I0:   params_max =   1e8; break;
+          case PM_PAR_XPOS: params_max =   1e4; break;
+          case PM_PAR_YPOS: params_max =   1e4; break;
+          case PM_PAR_SXX:  params_max =   100; break;
+          case PM_PAR_SYY:  params_max =   100; break;
+          case PM_PAR_SXY:  params_max =  +5.0; break;
+          default:
+            psAbort("invalid parameter %d for param max test", nParam);
+        }
+        if (params[nParam] > params_max) {
+            params[nParam] = params_max;
+            return false;
+        }
+        return true;
       default:
-	psAbort("invalid choice for limits");
+        psAbort("invalid choice for limits");
     }
     psAbort("should not reach here");
@@ -204,5 +204,5 @@
 }
 
-bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, pmPSF *psf)
+bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf)
 {
     psF32 *out = modelPSF->params->data.F32;
@@ -214,10 +214,10 @@
 
     for (int i = 0; i < psf->params->n; i++) {
-	if (psf->params->data[i] == NULL) {
-	    out[i] = in[i];
-	} else {	    
-	    pmTrend2D *trend = psf->params->data[i];
-	    out[i] = pmTrend2DEval(trend, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
-	}
+        if (psf->params->data[i] == NULL) {
+            out[i] = in[i];
+        } else {
+            pmTrend2D *trend = psf->params->data[i];
+            out[i] = pmTrend2DEval(trend, in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+        }
     }
 
@@ -230,5 +230,5 @@
 // construct the PSF model from the FLT model and the psf
 // XXX is this sufficiently general do be a global function, not a pmModelClass function?
-bool PM_MODEL_PARAMS_FROM_PSF (pmModel *model, pmPSF *psf, float Xo, float Yo, float Io)
+bool PM_MODEL_PARAMS_FROM_PSF (pmModel *model, const pmPSF *psf, float Xo, float Yo, float Io)
 {
     psF32 *PAR = model->params->data.F32;
@@ -242,10 +242,10 @@
     PAR[PM_PAR_XPOS] = Xo;
     PAR[PM_PAR_YPOS] = Yo;
-    
+
     // supply the model-fitted parameters, or copy from the input
     for (int i = 0; i < psf->params->n; i++) {
-	if (i == PM_PAR_SKY) continue;
-	pmTrend2D *trend = psf->params->data[i];
-	PAR[i] = pmTrend2DEval(trend, Xo, Yo);
+        if (i == PM_PAR_SKY) continue;
+        pmTrend2D *trend = psf->params->data[i];
+        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 
@@ -254,6 +254,6 @@
     // XXX user-defined value for limit?
     if (!pmPSF_FitToModel (PAR, 0.1)) {
-	psError(PM_ERR_PSF, false, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo);
-	return false;
+        psError(PM_ERR_PSF, false, "Failed to fit object at (r,c) = (%.1f,%.1f)", Xo, Yo);
+        return false;
     }
 
@@ -265,11 +265,11 @@
             continue;
 
-	bool status = true;
+        bool status = true;
         status &= PM_MODEL_LIMITS (PS_MINIMIZE_PARAM_MIN, i, PAR, NULL);
         status &= PM_MODEL_LIMITS (PS_MINIMIZE_PARAM_MAX, i, PAR, NULL);
-	if (!status) {
-	    psTrace ("psModules.objects", 5, "Hitting parameter limits at (r,c) = (%.1f, %.1f)", Xo, Yo);
-	    model->flags |= PM_MODEL_STATUS_LIMITS;
-	}
+        if (!status) {
+            psTrace ("psModules.objects", 5, "Hitting parameter limits at (r,c) = (%.1f, %.1f)", Xo, Yo);
+            model->flags |= PM_MODEL_STATUS_LIMITS;
+        }
     }
     return(true);