Changeset 15834 for trunk/psModules/src/objects/models/pmModel_PGAUSS.c

Timestamp:

Dec 14, 2007, 2:58:11 PM (18 years ago)

Author:

Paul Price

Message:

Adding const in some appropriate places.

File:

• trunk/psModules/src/objects/models/pmModel_PGAUSS.c (modified) (14 diffs)

trunk/psModules/src/objects/models/pmModel_PGAUSS.c

@@ -6 +6 @@
  * specifics of the model.  All models which are used a PSF representations share a few
  * parameters, for which # define names are listed in pmModel.h:
- 
+
    Gaussian taylor expansion
    1 / (1 + z + z^2/2 + z^3/6)
- 
+
  * PM_PAR_SKY 0   - local sky : note that this is unused and may be dropped in the future
  * PM_PAR_I0 1    - central intensity
@@ -19 +19 @@
  *****************************************************************************/
 
-# define PM_MODEL_FUNC            pmModelFunc_PGAUSS
-# define PM_MODEL_FLUX            pmModelFlux_PGAUSS
-# define PM_MODEL_GUESS           pmModelGuess_PGAUSS
-# define PM_MODEL_LIMITS          pmModelLimits_PGAUSS
-# define PM_MODEL_RADIUS          pmModelRadius_PGAUSS
-# define PM_MODEL_FROM_PSF        pmModelFromPSF_PGAUSS
+# define PM_MODEL_FUNC            pmModelFunc_PGAUSS
+# define PM_MODEL_FLUX            pmModelFlux_PGAUSS
+# define PM_MODEL_GUESS           pmModelGuess_PGAUSS
+# define PM_MODEL_LIMITS          pmModelLimits_PGAUSS
+# define PM_MODEL_RADIUS          pmModelRadius_PGAUSS
+# define PM_MODEL_FROM_PSF        pmModelFromPSF_PGAUSS
 # define PM_MODEL_PARAMS_FROM_PSF pmModelParamsFromPSF_PGAUSS
 # define PM_MODEL_FIT_STATUS      pmModelFitStatus_PGAUSS
@@ -77 +77 @@
         f2 = 1.0 / PS_SQR(params[PM_PAR_SYY]) - 1.0 / PS_SQR(params[PM_PAR_SXX]);
         q1 = PS_SQR(f1)*AR_RATIO - PS_SQR(f2);
-        q1 = PS_MAX (0.0, q1); 
-        // if q1 < 0.0, f2 ~ f1, we have a very large axis ratio near 45deg..  Saturate at that
-        // angle and let f2,f1 fight it out
+        q1 = PS_MAX (0.0, q1);
+        // if q1 < 0.0, f2 ~ f1, we have a very large axis ratio near 45deg..  Saturate at that
+        // angle and let f2,f1 fight it out
         q2  = 0.5*sqrt (q1);
     }
@@ -112 +112 @@
         if (fabs(beta[nParam]) > fabs(beta_lim)) {
             beta[nParam] = (beta[nParam] > 0) ? fabs(beta_lim) : -fabs(beta_lim);
-            psTrace ("psModules.objects", 5, "|beta[nParam==%d]| > |beta_lim|; %g v. %g",
-                     nParam, beta[nParam], beta_lim);
+            psTrace ("psModules.objects", 5, "|beta[nParam==%d]| > |beta_lim|; %g v. %g",
+                     nParam, beta[nParam], beta_lim);
             return false;
         }
@@ -143 +143 @@
             psAbort("invalid parameter %d for param min test", nParam);
         }
-        if (params[nParam] < params_min) {
+        if (params[nParam] < params_min) {
             params[nParam] = params_min;
-            psTrace ("psModules.objects", 5, "params[nParam==%d] < params_min; %g v. %g",
-                     nParam, params[nParam], params_min);
+            psTrace ("psModules.objects", 5, "params[nParam==%d] < params_min; %g v. %g",
+                     nParam, params[nParam], params_min);
             return false;
         }
@@ -178 +178 @@
         if (params[nParam] > params_max) {
             params[nParam] = params_max;
-            psTrace ("psModules.objects", 5, "params[nParam==%d] > params_max; %g v. %g",
-                     nParam, params[nParam], params_max);
+            psTrace ("psModules.objects", 5, "params[nParam==%d] > params_max; %g v. %g",
+                     nParam, params[nParam], params_max);
             return false;
         }
@@ -292 +292 @@
     while ((Nstep < 10) && (fabs(z1 - z0) > 0.5)) {
         z = 0.5*(z0 + z1);
-        f = 1.0 / (1 + z + z*z/2.0 + z*z*z/6.0);
+        f = 1.0 / (1 + z + z*z/2.0 + z*z*z/6.0);
         if (f > limit) {
             z0 = z;
@@ -314 +314 @@
 }
 
-bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, pmPSF *psf)
+bool PM_MODEL_FROM_PSF (pmModel *modelPSF, pmModel *modelFLT, const pmPSF *psf)
 {
 
@@ -339 +339 @@
     // convert to shape terms (SXX,SYY,SXY)
     if (!pmPSF_FitToModel (out, 0.1)) {
-        psError(PM_ERR_PSF, false, "Failed to fit object at (r,c) = (%.1f,%.1f)",
-                in[PM_PAR_YPOS], in[PM_PAR_XPOS]);
-        return false;
+        psError(PM_ERR_PSF, false, "Failed to fit object at (r,c) = (%.1f,%.1f)",
+                in[PM_PAR_YPOS], in[PM_PAR_XPOS]);
+        return false;
     }
 
@@ -351 +351 @@
             continue;
 
-        bool status = true;
+        bool status = true;
         status &= PM_MODEL_LIMITS (PS_MINIMIZE_PARAM_MIN, i, out, NULL);
         status &= PM_MODEL_LIMITS (PS_MINIMIZE_PARAM_MAX, i, out, NULL);
-        if (!status) {
-            psTrace ("psModules.objects", 5, "Hitting parameter limits at (r,c) = (%.1f, %.1f)",
-                     in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
-            modelPSF->flags |= PM_MODEL_STATUS_LIMITS;
-        }
+        if (!status) {
+            psTrace ("psModules.objects", 5, "Hitting parameter limits at (r,c) = (%.1f, %.1f)",
+                     in[PM_PAR_XPOS], in[PM_PAR_YPOS]);
+            modelPSF->flags |= PM_MODEL_STATUS_LIMITS;
+        }
     }
     return(true);
@@ -365 +365 @@
 // 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;
@@ -377 +377 @@
     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;
-        if (i == PM_PAR_I0) continue;
-        if (i == PM_PAR_XPOS) continue;
-        if (i == PM_PAR_YPOS) continue;
-        pmTrend2D *trend = psf->params->data[i];
-        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
+        if (i == PM_PAR_SKY) continue;
+        if (i == PM_PAR_I0) continue;
+        if (i == PM_PAR_XPOS) continue;
+        if (i == PM_PAR_YPOS) continue;
+        pmTrend2D *trend = psf->params->data[i];
+        PAR[i] = pmTrend2DEval(trend, Xo, Yo);
     }
 
@@ -392 +392 @@
     // 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;
     }
 
@@ -403 +403 @@
             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);