Changeset 40561 for trunk/Ohana/src/dvosplit/src/split_averages.subset.c

Timestamp:

Nov 29, 2018, 1:29:46 PM (8 years ago)

Author:

eugene

Message:

update dvosplit to handle all catalog tables

File:

• trunk/Ohana/src/dvosplit/src/split_averages.subset.c (copied) (copied from trunk/Ohana/src/dvosplit/src/split_averages.c ) (2 diffs)

trunk/Ohana/src/dvosplit/src/split_averages.subset.c

@@ -2 +2 @@
 # define NROWS 1000000 /* ~10MB per block for measures */
 # define DNOUT 1000
+
+/* used in find_matches, find_matches_refstars */
+# define IN_REGION(REG,R,D) (                        \
+((D) >= REG[0].Dmin) && ((D) < REG[0].Dmax) && \
+((R) >= REG[0].Rmin) && ((R) < REG[0].Rmax))
+
 
 AveLinks *split_averages (Catalog *incatalog, SkyList *outlist, Catalog *outcatalogs) {
@@ -53 +59 @@
       inD = incatalog[0].average[ave].D;
 
+      // XXX do not skip : galphot dvo has Nmeasure == 0
       if (incatalog[0].average[ave].Nmeasure == 0) {
         fprintf (stderr, "WARNING: object with no measurements, skipping %d (%f, %f)\n", averef, inR, inD);
-        continue;
       }
+
       // which of the outcatalogs contains this coordinate?
-
       Ncat = -1;
       for (cat = 0; cat < outlist[0].Nregions; cat++) {
-        if (inR < outlist[0].regions[cat][0].Rmin) continue;
-        if (inR > outlist[0].regions[cat][0].Rmax) continue;
-        if (inD < outlist[0].regions[cat][0].Dmin) continue;
-        if (inD > outlist[0].regions[cat][0].Dmax) continue;
+        if (!IN_REGION(outlist[0].regions[cat], inR, inD)) continue;
         Ncat = cat;
         break;
       }
 
+      // NO outcatalogs contains this coordinate?
       if (Ncat == -1) {
         fprintf (stderr, "WARNING: missed %d (%f, %f)\n", averef, inR, inD);