Changeset 9775 for trunk/psModules/src/objects/models/pmModel_GAUSS.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_GAUSS.c (modified) (4 diffs)

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

@@ -1 +1 @@
 /******************************************************************************
- * this file defines the PGAUSS source shape model.  Note that these model functions are loaded
+ * this file defines the GAUSS source shape model.  Note that these model functions are loaded
  * by pmModelGroup.c using 'include', and thus need no 'include' statements of their own.  The
  * models use a psVector to represent the set of parameters, with the sequence used to specify
@@ -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:
+ 
+   pure Gaussian:
+   exp(-z)
  
  * PM_PAR_SKY 0   - local sky : note that this is unused and may be dropped in the future
@@ -114 +117 @@
     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
@@ -131 +134 @@
     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];
 
     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));
     return (radius);
 }