Changeset 40581 for trunk/Ohana/src/opihi/dvo/skyregion.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/skyregion.c (modified) (2 diffs)

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

@@ -186 +186 @@
   list->regions[Nout] = input->regions[0];
   list->filename[Nout] = input->filename[0];
+  Nout ++;
 
   for (int i = 0; i < input->Nregions; i++) {
-    if (list->regions[Nout][0].index == input->regions[i][0].index) continue;
-    Nout ++;
+    if (list->regions[Nout-1][0].index == input->regions[i][0].index) continue;
     list->regions[Nout] = input->regions[i];
     list->filename[Nout] = input->filename[i];
+    Nout ++;
   }
   list->Nregions = Nout;
@@ -249 +250 @@
     // scan over the remaining points to find any that lie within these regions
     // if we sorted the ra,dec inputs we could break out of this more quickly
-    for (int j = i + 1; j < Npts; j++) {
+    for (int j = i + 1; FALSE && (j < Npts); j++) {
       ra = RA->elements.Flt[j];
       dec = DEC->elements.Flt[j];
-      for (int n = 0; !found[j] && (n < new->Nregions); n++) {
+      for (int n = 0; n < new->Nregions; n++) {
         if (ra  < new[0].regions[n][0].Rmin) continue;
         if (ra  > new[0].regions[n][0].Rmax) continue;