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

Timestamp:

Oct 29, 2006, 5:02:59 PM (20 years ago)

Author:

magnier

Message:

major cleanup of model code, fixes to use new param defs

File:

• trunk/psModules/src/objects/models/pmModel_PGAUSS.c (modified) (4 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
@@ -115 +118 @@
     shape.sx  = PAR[PM_PAR_SXX] / sqrt(2.0);
     shape.sy  = PAR[PM_PAR_SYY] / sqrt(2.0);
-    shape.sxy = PAR[PM_PAR_SXY] / sqrt(2.0);
+    shape.sxy = PAR[PM_PAR_SXY];
 
     // Area is equivalent to 2 pi sigma^2
@@ -146 +149 @@
 psF64 PM_MODEL_RADIUS (const psVector *params, psF64 flux)
 {
+    psEllipseShape shape;
+
+    psF32 *PAR = params->data.F32;
+
     if (flux <= 0)
         return (1.0);
-    if (params->data.F32[PM_PAR_I0] <= 0)
+    if (PAR[PM_PAR_I0] <= 0)
         return (1.0);
-    if (flux >= params->data.F32[PM_PAR_I0])
+    if (flux >= PAR[PM_PAR_I0])
         return (1.0);
-
-    psF32 *PAR = params->data.F32;
 
     shape.sx  = PAR[PM_PAR_SXX] / sqrt(2.0);
     shape.sy  = PAR[PM_PAR_SYY] / sqrt(2.0);
-    shape.sxy = PAR[PM_PAR_SXY] / sqrt(2.0);
+    shape.sxy = PAR[PM_PAR_SXY];
 
     // this estimates the radius assuming f(z) is roughly exp(-z)
     psEllipseAxes axes = psEllipseShapeToAxes (shape);
-    psF64 radius = axes.major * sqrt (2.0 * log(params->data.F32[PM_PAR_I0] / flux));
+    psF64 radius = axes.major * sqrt (2.0 * log(PAR[PM_PAR_I0] / flux));
 
     if (isnan(radius))
-        psAbort ("psphot.model", "error in code: never return invalid radius");
+        psAbort ("psphot.model", "error in code: radius is NaN");
     if (radius < 0)
-        psAbort ("psphot.model", "error in code: never return invalid radius");
+        psAbort ("psphot.model", "error in code: radius is negative");
 
     return (radius);
@@ -215 +220 @@
     status &= ((dPAR[PM_PAR_I0]/PAR[PM_PAR_I0]) < 0.5);
 
-    if (status)
-        return true;
-    return false;
+    return status;
 }