Changeset 6872 for trunk/psModules/src/objects/models/pmModel_SGAUSS.c

Timestamp:

Apr 17, 2006, 8:01:05 AM (20 years ago)

Author:

magnier

Message:

updates relative to rel10_ifa_1

File:

• trunk/psModules/src/objects/models/pmModel_SGAUSS.c (modified) (10 diffs)

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

@@ -17 +17 @@
 
 # define SQ(A)((A)*(A))
-psF64 psImageEllipseContour (EllipseAxes axes, double xc, double yc, psImage *image);
+psF64 psImageEllipseContour (psEllipseAxes axes, double xc, double yc, psImage *image);
 psF64 p_psImageGetElementF64(psImage *a, int i, int j);
 
@@ -102 +102 @@
 
 // measure the flux for the elliptical contour
-psF64 psImageEllipseContour (EllipseAxes axes, double xc, double yc, psImage *image)
+psF64 psImageEllipseContour (psEllipseAxes axes, double xc, double yc, psImage *image)
 {
 
@@ -149 +149 @@
     psF32     *params   = model->params->data.F32;
 
-    EllipseAxes axes;
-    EllipseShape shape;
-    EllipseMoments moments;
+    psEllipseAxes axes;
+    psEllipseShape shape;
+    psEllipseMoments moments;
 
     moments.x2 = PS_SQR(sMoments->Sx);
@@ -158 +158 @@
 
     // solve the math to go from Moments To Shape
-    axes = EllipseMomentsToAxes(moments);
-    shape = EllipseAxesToShape(axes);
+    axes = psEllipseMomentsToAxes(moments);
+    shape = psEllipseAxesToShape(axes);
 
     params[0] = sMoments->Sky;
@@ -199 +199 @@
     float f1, f2;
 
-    EllipseAxes axes;
-    EllipseShape shape;
-    EllipseMoments moments;
+    psEllipseAxes axes;
+    psEllipseShape shape;
+    psEllipseMoments moments;
 
     moments.x2 = PS_SQR(sMoments->Sx);
@@ -208 +208 @@
 
     // solve the math to go from Moments To Shape
-    axes = EllipseMomentsToAxes(moments);
-    shape = EllipseAxesToShape(axes);
+    axes = psEllipseMomentsToAxes(moments);
+    shape = psEllipseAxesToShape(axes);
 
     params[0] = sMoments->Sky;
@@ -265 +265 @@
 psF64 pmModelRadius_SGAUSS  (const psVector *params, psF64 flux)
 {
-    psF64 r, z, pr, f;
+    psF64 r, z = 0.0, pr, f;
     psF32 *PAR = params->data.F32;
 
-    EllipseAxes axes;
-    EllipseShape shape;
+    psEllipseAxes axes;
+    psEllipseShape shape;
 
     if (flux <= 0)
@@ -283 +283 @@
     shape.sxy = PAR[6];
 
-    axes = EllipseShapeToAxes (shape);
+    axes = psEllipseShapeToAxes (shape);
     psF64 dr = 1.0 / axes.major;
     psF64 limit = flux / PAR[1];
@@ -327 +327 @@
     psF32 dP;
     bool  status;
-    EllipseAxes axes;
-    EllipseShape shape;
+    psEllipseAxes axes;
+    psEllipseShape shape;
 
     psF32 *PAR  = model->params->data.F32;
@@ -337 +337 @@
     shape.sxy = PAR[6];
 
-    axes = EllipseShapeToAxes (shape);
+    axes = psEllipseShapeToAxes (shape);
 
     dP = 0;