Changeset 6565 for branches/rel10_ifa/psModules/src/objects/models/pmModel_SGAUSS.c

Timestamp:

Mar 8, 2006, 6:25:04 PM (20 years ago)

Author:

Paul Price

Message:

Building without objects until discrepancies between PAP and EAM over pmHDU,pmFPA,etc are resolved

File:

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

branches/rel10_ifa/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);
 
@@ -99 +99 @@
 
 // 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)
 {
 
@@ -145 +145 @@
     psF32     *params   = model->params->data.F32;
 
-    EllipseAxes axes;
-    EllipseShape shape;
-    EllipseMoments moments;
+    psEllipseAxes axes;
+    psEllipseShape shape;
+    psEllipseMoments moments;
 
     moments.x2 = PS_SQR(sMoments->Sx);
@@ -154 +154 @@
 
     // 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;
@@ -195 +195 @@
     float f1, f2;
 
-    EllipseAxes axes;
-    EllipseShape shape;
-    EllipseMoments moments;
+    psEllipseAxes axes;
+    psEllipseShape shape;
+    psEllipseMoments moments;
 
     moments.x2 = PS_SQR(sMoments->Sx);
@@ -204 +204 @@
 
     // 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;
@@ -264 +264 @@
     psF32 *PAR = params->data.F32;
 
-    EllipseAxes axes;
-    EllipseShape shape;
+    psEllipseAxes axes;
+    psEllipseShape shape;
 
     if (flux <= 0)
@@ -279 +279 @@
     shape.sxy = PAR[6];
 
-    axes = EllipseShapeToAxes (shape);
+    axes = psEllipseShapeToAxes (shape);
     psF64 dr = 1.0 / axes.major;
     psF64 limit = flux / PAR[1];
@@ -323 +323 @@
     psF32 dP;
     bool  status;
-    EllipseAxes axes;
-    EllipseShape shape;
+    psEllipseAxes axes;
+    psEllipseShape shape;
 
     psF32 *PAR  = model->params->data.F32;
@@ -333 +333 @@
     shape.sxy = PAR[6];
 
-    axes = EllipseShapeToAxes (shape);
+    axes = psEllipseShapeToAxes (shape);
 
     dP = 0;