Changeset 26280

Timestamp:

Nov 25, 2009, 11:51:19 AM (16 years ago)

Author:

eugene

Message:

add function for generating closest refstar match (as default, like regular addstar)

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (2 diffs)
• include/addstar.h (modified) (1 diff)
• src/addstar.c (modified) (1 diff)
• src/find_matches_closest_refstars.c (added)
• src/getusnob.c (modified) (1 diff)

trunk/Ohana/src/addstar/Makefile

@@ -51 +51 @@
 $(SRC)/find_matches_closest.$(ARCH).o \
 $(SRC)/find_matches_refstars.$(ARCH).o \
+$(SRC)/find_matches_closest_refstars.$(ARCH).o \
 $(SRC)/find_subset.$(ARCH).o \
 $(SRC)/getgsc.$(ARCH).o \
@@ -197 +198 @@
 $(SRC)/get2mass_full.$(ARCH).o \
 $(SRC)/find_matches_refstars.$(ARCH).o \
+$(SRC)/build_links.$(ARCH).o \
 $(SRC)/args_load2mass.$(ARCH).o \
 $(SRC)/replace_match.$(ARCH).o \

trunk/Ohana/src/addstar/include/addstar.h

@@ -172 +172 @@
 int        find_matches_closest   PROTO((SkyRegion *region, Stars *stars, int Nstars, Catalog *catalog, AddstarClientOptions options));
 int        find_matches_refstars  PROTO((SkyRegion *region, Stars **stars, int Nstars, Catalog *catalog, AddstarClientOptions options));
+int        find_matches_closest_refstars  PROTO((SkyRegion *region, Stars **stars, int Nstars, Catalog *catalog, AddstarClientOptions options));
 
 Stars    **find_subset            PROTO((SkyRegion *region, Stars *stars, int Nstars, int *NSTARS));

trunk/Ohana/src/addstar/src/addstar.c

@@ -138 +138 @@
       case M_REFLIST:
         subset = find_subset (skylist[0].regions[i], stars, Nstars, &Nsubset);
-        Nmatch += find_matches_refstars (skylist[0].regions[i], subset, Nsubset, &catalog, options);
+        if (options.closest) {
+          Nmatch += find_matches_closest_refstars (skylist[0].regions[i], subset, Nsubset, &catalog, options);
+        } else {
+          Nmatch += find_matches_refstars (skylist[0].regions[i], subset, Nsubset, &catalog, options);
+        }
         if (Nsubset) free (subset);
         break;

trunk/Ohana/src/addstar/src/getusnob.c

@@ -178 +178 @@
     free (buffer);
     Nitemsum += Nitems;
-    fprintf (stderr, "Nusno: %d, Nitems: %d, Nitemsum : %d, Nbytes stars: %d\n",
-             Nusno, Nitems, Nitemsum, (unsigned int) (Nusno*sizeof(Stars)));
+    if (VERBOSE) fprintf (stderr, "Nusno: %d, Nitems: %d, Nitemsum : %d, Nbytes stars: %d\n", Nusno, Nitems, Nitemsum, (unsigned int) (Nusno*sizeof(Stars)));
     fclose (f);
   }