Changeset 6565 for branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMF.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/pmSourceIO_CMF.c (modified) (5 diffs)

branches/rel10_ifa/psModules/src/objects/pmSourceIO_CMF.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-03-09 03:14:23 $
+ *  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-09 04:25:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -39 +39 @@
     float lsky;
     bool status;
-    EllipseShape shape;
-    EllipseAxes axes;
+    psEllipseShape shape;
+    psEllipseAxes axes;
 
     // find config information for output header
@@ -63 +63 @@
         shape.sy  = PAR[5];
         shape.sxy = PAR[6];
-        axes = EllipseShapeToAxes (shape);
+        axes = psEllipseShapeToAxes (shape);
 
         row = psMetadataAlloc ();
@@ -98 +98 @@
     bool status;
     psF32 *PAR, *dPAR;
-    EllipseShape shape;
-    EllipseAxes axes;
+    psEllipseShape shape;
+    psEllipseAxes axes;
     float lsky;
 
@@ -140 +140 @@
         axes.theta     = psMetadataLookupF32 (&status, row, "THETA");
 
-        shape = EllipseAxesToShape (axes);
+        shape = psEllipseAxesToShape (axes);
 
         PAR[4] = shape.sx;