Changeset 31238

Timestamp:

Apr 7, 2011, 3:45:46 PM (15 years ago)

Author:

bills

Message:

add parameter -listchipcoords to dvoImagesAtCoords. If supplied the program prints out
the image coordinates for each matched point

Location:

trunk/Ohana/src/getstar

Files:

• include/dvoImagesAtCoords.h (modified) (2 diffs)
• src/MatchCoords.c (modified) (1 diff)
• src/args_coords.c (modified) (1 diff)
• src/dvoImagesAtCoords.c (modified) (4 diffs)

trunk/Ohana/src/getstar/include/dvoImagesAtCoords.h

@@ -7 +7 @@
 
 int       VERBOSE;
+int       LISTCHIPCOORDS;
 
 char OUTPUT[256];
@@ -19 +20 @@
 
 typedef struct {
+    int     n;
+    double  x;
+    double  y;
+} Match;
+
+typedef struct {
     int     id;
     double  ra;
     double  dec;
     int     Nmatches;
-    int     *matches;
+    Match   *matches;
     int     arrayLength;
 } Point;

trunk/Ohana/src/getstar/src/MatchCoords.c

@@ -93 +93 @@
             totalMatches++;
 
-            pt->matches[pt->Nmatches] = i;
+            pt->matches[pt->Nmatches].n = i;
+            pt->matches[pt->Nmatches].x = x;
+            pt->matches[pt->Nmatches].y = y;
             pt->Nmatches ++;
 
             if (pt->Nmatches == pt->arrayLength) {
                 pt->arrayLength += 20;
-                REALLOCATE (pt->matches, int, pt->arrayLength);
+                REALLOCATE (pt->matches, Match, pt->arrayLength);
             }
         }

trunk/Ohana/src/getstar/src/args_coords.c

@@ -41 +41 @@
 
   /* check for command line options */
+  LISTCHIPCOORDS = FALSE;
+  if ((N = get_argument (argc, argv, "-listchipcoords"))) {
+    LISTCHIPCOORDS = TRUE;
+    remove_argument (N, &argc, argv);
+  }
   WITH_PHU = FALSE;
   if ((N = get_argument (argc, argv, "+phu"))) {

trunk/Ohana/src/getstar/src/dvoImagesAtCoords.c

@@ -91 +91 @@
     while ((Nread = fscanf(f, "%d %lf %lf\n", &pts[Npoints].id, &pts[Npoints].ra, &pts[Npoints].dec)) == 3) {
         pts[Npoints].Nmatches = 0;
-        ALLOCATE(pts[Npoints].matches, int, 20);
+        ALLOCATE(pts[Npoints].matches, Match, 20);
         pts[Npoints].arrayLength = 20;
 
@@ -118 +118 @@
     pts[0].dec = dec;
     pts[0].Nmatches = 0;
-    ALLOCATE(pts[0].matches, int, 20);
+    ALLOCATE(pts[0].matches, Match, 20);
     pts[0].arrayLength = 20;
 
@@ -133 +133 @@
       Point *pt = points + j;
       for (i = 0; i < pt->Nmatches; i++) {
-        int N = pt->matches[i];
+        int N = pt->matches[i].n;
+        double x = pt->matches[i].x;
+        double y = pt->matches[i].y;
 
         char *name;
@@ -150 +152 @@
             name = dbImages[N].name;
         }
-        fprintf (stdout, "%d %lf %lf %s\n", pt->id, pt->ra, pt->dec, name);
+        if (LISTCHIPCOORDS) {
+            fprintf (stdout, "%d %lf %lf %s %8.2lf %8.2lf\n", pt->id, pt->ra, pt->dec, name, x, y);
+        } else {
+            fprintf (stdout, "%d %lf %lf %s\n", pt->id, pt->ra, pt->dec, name);
+        }
         if  (copy) {
             free(copy);