Changeset 5445 for trunk/Ohana/src/addstar/include/addstar.h

Timestamp:

Oct 24, 2005, 8:47:45 PM (21 years ago)

Author:

eugene

Message:

fixes for SkyRegion implementation

File:

• trunk/Ohana/src/addstar/include/addstar.h (modified) (6 diffs)

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

@@ -39 +39 @@
 char   HOSTNAME[80];
 int    NVALID, *VALID_IP;
+char   SKY_TABLE[256];
 int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
+SkyTable *ServerSky;
 
 /* used to select entries from header (gstars or parse_time) (KEEP) */
@@ -71 +73 @@
 int    VERBOSE;
 
-/* modify server behavoir (make this an addstar cleanup mode?) */
+/* modify server behavior (make this an addstar cleanup mode?) */
 int    FORCE_READ;
 
@@ -115 +117 @@
 void       help                   PROTO(());
 int        in_image               PROTO((double r, double d, Image *image));
-int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region));  /*** choose new name ***/
+int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region, char *path));  /*** choose new name ***/
 void       load_subpix            PROTO(());
 void       lock_image_db          PROTO((FITS_DB *db, char *filename));
@@ -132 +134 @@
 time_t     short_date_to_sec      PROTO((char *date));
 void       sort_lists             PROTO((float *X, float *Y, int *S, int N));
-void       sort_regions           PROTO((GSCRegion *region, int N));
 void       sort_stars             PROTO((Stars *stars, int N));
 int        str_to_radec           PROTO((double *ra, double *dec, char *str1, char *str2));
@@ -154 +155 @@
 Missing *sort_missing (Average *average, int Naverage, Missing *missing, int Nmissing, int *next_miss);
 
+/* functions which use GSCRegion, now deprecated */
+void       sort_regions           PROTO((GSCRegion *region, int N));
 GSCRegion *LoadRegions            PROTO((int *nregions));
 int        FindDecBand            PROTO((double dec, double *DEC0, double *DEC1));
@@ -193 +196 @@
 int UpdateDatabase_Image (AddstarClientOptions *options, Image *image, Coords *mosaic, Stars *stars, int Nstars);
 int UpdateDatabase_Reflist (AddstarClientOptions *options, Stars *stars, int Nstars);
-int UpdateDatabase_Refcat (AddstarClientOptions *options, GSCRegion *UserPatch, char *refcat);
+int UpdateDatabase_Refcat (AddstarClientOptions *options, SkyRegion *UserPatch, char *refcat);
 
 SkyList *SkyListForStars (SkyTable *table, int depth, Stars *stars, int Nstars);
-SkyList *SkyListExistingSubset (SkyList *input);
+SkyList *SkyListExistingSubset (SkyList *input, char *path);
 int SkyListSetPath (SkyList *list, char *path);
+SkyTable *SkyTableLoadOptimal ();