Changeset 25027 for branches/pap/psModules/src/astrom/pmAstrometryObjects.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/astrom/pmAstrometryObjects.c (modified) (7 diffs)

branches/pap/psModules/src/astrom/pmAstrometryObjects.c

@@ -83 +83 @@
 {
     psArray *matches = psArrayAllocEmpty(x1->n);
+    psVector *found1 = psVectorAlloc(x1->n, PS_TYPE_S8);
+    psVector *found2 = psVectorAlloc(x2->n, PS_TYPE_S8);
 
     const double RADIUS_SQR = PS_SQR(RADIUS);
     double dX, dY, dR;
+
+    psVectorInit (found1, 0);
+    psVectorInit (found2, 0);
 
     int jStart;
@@ -100 +105 @@
         }
 
+        if (found1->data.S8[i]) {
+            i++;
+            continue;
+        }
+        if (found2->data.S8[j]) {
+            j++;
+            continue;
+        }
+
         jStart = j;
-        while (fabs(dX) < RADIUS && j < x2->n) {
+        while ((fabs(dX) < RADIUS) && (j < x2->n)) {
 
             dX = x1->data.F64[i] - x2->data.F64[j];
@@ -111 +125 @@
                 continue;
             }
+            if (found2->data.S8[j]) {
+                j++;
+                continue;
+            }
 
             // got a match; add to output list
@@ -117 +135 @@
             psFree (match);
 
+            found1->data.S8[i] = 1;
+            found2->data.S8[j] = 1;
+
             j++;
         }
@@ -122 +143 @@
         i++;
     }
+    psFree (found1);
+    psFree (found2);
+
     return (matches);
 }
@@ -420 +444 @@
     obj->sky  = psSphereAlloc();
     obj->Mag  = 0;
+    obj->Color= 0;
     obj->dMag = 0;
 
@@ -447 +472 @@
     *obj->sky  = *old->sky;
     obj->Mag   =  old->Mag;
+    obj->Color =  old->Color;
     obj->dMag  =  old->dMag;