Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/getstar/include/dvoImagesAtCoords.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/getstar/include/dvoImagesAtCoords.h (modified) (1 diff)

branches/simtest_nebulous_branches/Ohana/src/getstar/include/dvoImagesAtCoords.h

@@ -18 +18 @@
 Coords *MOSAIC;         // carries the mosaic into ReadImageHeader
 
+typedef struct {
+    int     id;
+    double  ra;
+    double  dec;
+    int     Nmatches;
+    int     *matches;
+    int     arrayLength;
+} Point;
+
+char *astromFile;
+char *coordsFile;
+double cmd_line_ra;
+double cmd_line_dec;
+int fullNames;
 int WITH_PHU;
 int SOLO_PHU;
 int ACCEPT_ASTROM;
-char *astromFile;
 
-// These functions belong to dvoImageOverap
+// These functions belong to dvoImagesAtCoords
 int  args_coords         PROTO((int argc, char **argv));
 int  ConfigInit_coords PROTO((int *argc, char **argv));
-int  Shutdown         PROTO((char *format, ...));
+int  Shutdown         PROTO((char *format, ...) OHANA_FORMAT(printf, 1, 2));
 void TrapSignal       PROTO((int sig));
 void SetProtect       PROTO((int mode));
 int  SetSignals       PROTO((void));
 
-Image *ReadImageFiles (char *filename, int *Nimages);
+Image *ReadImageFiles (char *filename, off_t *Nimages);
 int ReadImageHeader (Header *header, Image *image);
-int *MatchCoords(Image *, int, double, double, int *);
+off_t MatchCoords (Image *dbImages, off_t NdbImages, Point *points, int Npoints);
 
 int GetFileMode (Header *header);
-// int edge_check (double *x1, double *y1, double *x2, double *y2);
-// double opening_angle (double x1, double y1, double x2, double y2, double x3, double y3);