Changeset 7153

Timestamp:

May 19, 2006, 5:49:37 AM (20 years ago)

Author:

magnier

Message:

changed elements of pmAstromMatch to raw,ref (from i1,i2)

Location:

trunk/psModules/src/astrom

Files:

• pmAstrometryDistortion.c (modified) (3 diffs)
• pmAstrometryObjects.c (modified) (4 diffs)
• pmAstrometryObjects.h (modified) (2 diffs)

trunk/psModules/src/astrom/pmAstrometryDistortion.c

@@ -7 +7 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-05-19 15:39:53 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-19 15:49:37 $
 *
 *  Copyright 2006 Institute for Astronomy, University of Hawaii
@@ -85 +85 @@
                 pmAstromMatch *match = matches->data[i];
 
-                pmAstromObj *raw = rawstars->data[match->i1];
+                pmAstromObj *raw = rawstars->data[match->raw];
 
                 if (raw->chip->x < Xmin)
@@ -96 +96 @@
                     continue;
 
-                pmAstromObj *ref = refstars->data[match->i2];
+                pmAstromObj *ref = refstars->data[match->ref];
 
                 L->data.F32[Npts] = ref->FP->x;

trunk/psModules/src/astrom/pmAstrometryObjects.c

@@ -8 +8 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-05-19 15:39:53 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-19 15:49:37 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25 +25 @@
 #include "pmFPA.h"
 #include "pmAstrometryObjects.h"
-
 
 #define PM_ASTROMETRYOBJECTS_DEBUG 1
@@ -215 +214 @@
 
         pair    = match->data[i];
-        rawStar = raw->data[pair->i1];
-        refStar = ref->data[pair->i2];
+        rawStar = raw->data[pair->raw];
+        refStar = ref->data[pair->ref];
 
         X->data.F32[i] = rawStar->chip->x;
@@ -364 +363 @@
  ******************************************************************************/
 pmAstromMatch *pmAstromMatchAlloc(
-    int i1,
-    int i2)
+    int raw,
+    int ref)
 {
     pmAstromMatch *match = psAlloc (sizeof(pmAstromMatch));
     psMemSetDeallocator(match, (psFreeFunc) pmAstromMatchFree);
 
-    match->i1 = i1;
-    match->i2 = i2;
+    match->raw = raw;
+    match->ref = ref;
 
     return (match);

trunk/psModules/src/astrom/pmAstrometryObjects.h

@@ -8 +8 @@
 *  @author EAM, IfA
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-05-19 15:39:53 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-05-19 15:49:37 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -55 +55 @@
 typedef struct
 {
-    int i1;                             ///< What is this?
-    int i2;                             ///< What is this?
+    int raw;                             ///< What is this?
+    int ref;                             ///< What is this?
 }
 pmAstromMatch;