Changeset 40581 for trunk/Ohana/src/opihi/dvo/find_matches.c

Timestamp:

Dec 10, 2018, 5:05:32 PM (8 years ago)

Author:

eugene

Message:

fix end-post error in unique region list; test for coordinates in region based on normalized RA values; for regions near the 0,360 boundary, check above or below boundary if needed; do not try to weed out points based on discovered regions (with large radius, this test goes awry)

File:

• trunk/Ohana/src/opihi/dvo/find_matches.c (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/find_matches.c

@@ -213 +213 @@
   for (i = 0; i < Npoints; i++) {
     inCatalog[i] = FALSE;
-    if (RAvec->elements.Flt[i] < Rmin) continue;
-    if (RAvec->elements.Flt[i] > Rmax) continue;
+
+    // we need to worry about points near the 0,360 boundary.  I have expanded Rmin and
+    // Rmax to account for the RADIUS.  if I have a region which is close to the boundary,
+    // then: Rmin < 0 or Rmax > 360.  if so, check on the other side as well
+
+    int altTest = FALSE;
+    double Rnorm = ohana_normalize_angle (RAvec->elements.Flt[i]);
+    if ((Rmax > 360.0) && (Rnorm < 180.0)) {
+      double Rtest = Rnorm + 360.0;
+      if (Rtest < Rmin) continue;
+      if (Rtest > Rmax) continue;
+      altTest = TRUE;
+    }
+    if ((Rmin < 0.0) && (Rnorm > 180.0)) {
+      double Rtest = Rnorm - 360.0;
+      if (Rtest < Rmin) continue;
+      if (Rtest > Rmax) continue;
+      altTest = TRUE;
+    }
+    if (!altTest) {
+      if (Rnorm < Rmin) continue;
+      if (Rnorm > Rmax) continue;
+    }
+
     if (DECvec->elements.Flt[i] < Dmin) continue;
     if (DECvec->elements.Flt[i] > Dmax) continue;