Changeset 6565 for branches/rel10_ifa/psModules/src/objects/models/pmModel_ZGAUSS.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_ZGAUSS.c (modified) (4 diffs)

branches/rel10_ifa/psModules/src/objects/models/pmModel_ZGAUSS.c

@@ -85 +85 @@
     psF32 *PAR = params->data.F32;
 
-    EllipseAxes axes;
-    EllipseShape shape;
+    psEllipseAxes axes;
+    psEllipseShape shape;
 
     if (flux <= 0)
@@ -100 +100 @@
     shape.sxy = PAR[6];
 
-    axes = EllipseShapeToAxes (shape);
+    axes = psEllipseShapeToAxes (shape);
     psF64 dr = 1.0 / axes.major;
     psF64 limit = flux / PAR[1];
@@ -124 +124 @@
     psVector *params = model->params;
 
-    EllipseAxes axes;
-    EllipseShape shape;
-    EllipseMoments moments;
+    psEllipseAxes axes;
+    psEllipseShape shape;
+    psEllipseMoments moments;
 
     moments.x2 = PS_SQR(source->moments->Sx);
@@ -132 +132 @@
     moments.xy = source->moments->Sxy;
 
-    axes = EllipseMomentsToAxes(moments);
-    shape = EllipseAxesToShape(axes);
+    axes = psEllipseMomentsToAxes(moments);
+    shape = psEllipseAxesToShape(axes);
 
     params->data.F32[0] = source->moments->Sky;