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

Timestamp:

Oct 24, 2005, 10:36:17 AM (21 years ago)

Author:

eugene

Message:

adding SkyRegion support to addstar (removing GSCRegion)

File:

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

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

@@ -11 +11 @@
 /* used in find_matches, find_matches_refstars */
 # define IN_CATALOG(R,D) ( \
-((D) >= region[0].DEC[0]) && ((D) < region[0].DEC[1]) && \
-((R) >= region[0].RA[0])  && ((R) < region[0].RA[1]))
+((D) >= region[0].Dmin) && ((D) < region[0].Dmax) && \
+((R) >= region[0].Rmin)  && ((R) < region[0].Rmax))
 
 /* grab named photcode */
@@ -39 +39 @@
 char   HOSTNAME[80];
 int    NVALID, *VALID_IP;
+int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
 
 /* used to select entries from header (gstars or parse_time) (KEEP) */
@@ -79 +80 @@
 /* these depend on HOW we implement the client/server interaction for CAT/REF modes */
 time_t    TIMEREF;    // used by MODE REF
-GSCRegion UserPatch;  // used by MODE CAT
+SkyRegion UserPatch;  // used by MODE CAT
 char     *SELECT_2MASS_QUALITY;  // used only by get2mass_as
 
@@ -86 +87 @@
 AddstarClientOptions ConfigInit   PROTO((int *argc, char **argv));
 void       FindCalibration        PROTO((Image *image));
-int        FindDecBand            PROTO((double dec, double *DEC0, double *DEC1));
-int        FindRegionByPoint      PROTO((GSCRegion *regions, double ra, double dec, GSCRegion *gsc, int Ngsc));
-int        FindRegionDecBandStart PROTO((GSCRegion *region, int Nregion, double dec));
-int        FindRegionDecBandStop  PROTO((GSCRegion *region, int Nregion, double dec));
 FILE      *GetDB                  PROTO((int *state));
 void       InitCalibration        PROTO(());
-GSCRegion *LoadRegions            PROTO((int *nregions));
 void       SaveCalibration        PROTO((float M, float dM, float Mr, float dMr, float Mc, float A, int N));
 void       SetProtect             PROTO((int mode));
@@ -100 +96 @@
 float      airmass                PROTO((float secz_image, double ra, double dec, double st, double latitude));
 void       SetAirmassQuality      PROTO((int quality));
-void       aregion                PROTO((GSCRegion *region, FILE *f, double ra, double dec));
 AddstarClientOptions args         PROTO((int argc, char **argv, AddstarClientOptions options));
 void       check_permissions      PROTO((char *basefile));
 int        dump_rawstars          PROTO((Stars *stars, int Nstars));
 int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
-void       find_matches           PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap, Coords *mosaic, AddstarClientOptions options));
-void       find_matches_closest   PROTO((GSCRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap, Coords *mosaic, AddstarClientOptions options));
-void       find_matches_refstars  PROTO((GSCRegion *region, Stars **stars, int Nstars, Catalog *catalog, AddstarClientOptions options));
-Stars    **find_subset            PROTO((GSCRegion *region, Stars *stars, int Nstars, int *NSTARS));
+void       find_matches           PROTO((SkyRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap, Coords *mosaic, AddstarClientOptions options));
+void       find_matches_closest   PROTO((SkyRegion *region, Stars *stars, int Nstars, Catalog *catalog, Image *image, Image *overlap, int Noverlap, Coords *mosaic, AddstarClientOptions options));
+void       find_matches_refstars  PROTO((SkyRegion *region, Stars **stars, int Nstars, Catalog *catalog, AddstarClientOptions options));
+Stars    **find_subset            PROTO((SkyRegion *region, Stars *stars, int Nstars, int *NSTARS));
 int        gcatalog               PROTO((Catalog *catalog));
-Stars     *get2mass               PROTO((GSCRegion *patch, int photcode, int mode, int *NSTARS));
+Stars     *get2mass               PROTO((SkyRegion *patch, int photcode, int mode, int *NSTARS));
 double     get_subpix             PROTO((double x, double y));
-Stars     *getgsc                 PROTO((GSCRegion *patch, int *NSTARS));
-Stars     *getusno                PROTO((GSCRegion *catstats, int photcode, int *Nstars));
+Stars     *getgsc                 PROTO((SkyRegion *patch, int *NSTARS));
+Stars     *getusno                PROTO((SkyRegion *catstats, int photcode, int *Nstars));
 Image     *gimages                PROTO((FITS_DB *db, Image *image, Coords *mosaic, int *Npimage));
-Stars     *grefcat                PROTO((char *Refcat, GSCRegion *catstats, int photcode, int *nstars));
+Stars     *grefcat                PROTO((char *Refcat, SkyRegion *catstats, int photcode, int *nstars));
 Stars     *grefstars              PROTO((char *file, int photcode, int *Nstars));
-GSCRegion *gregion_image          PROTO((Image *image, Coords *mosaic, int *Nregions));
-GSCRegion *gregion_match          PROTO((GSCRegion *regions, int *nregions));
-GSCRegion *gregion_patch          PROTO((GSCRegion *patch, int *nregions));
-void       gregion_star           PROTO((Stars *star, GSCRegion *region));
-GSCRegion *gregion_stars          PROTO((Stars *stars, int Nstars, int *Nregion));
-GSCRegion *gregions               PROTO((Image *image, int *Nregions));
 Stars     *gstars                 PROTO((char *file, int *NSTARS, int photcode, Image *image));
 void       help                   PROTO(());
 int        in_image               PROTO((double r, double d, Image *image));
-int        load_pt_catalog        PROTO((Catalog *catalog, GSCRegion *region));  /*** choose new name ***/
+int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region));  /*** choose new name ***/
 void       load_subpix            PROTO(());
 void       lock_image_db          PROTO((FITS_DB *db, char *filename));
@@ -132 +121 @@
 void       make_backup            PROTO((char *filename));
 int        match_refstars         PROTO((Stars *stars, int Nstars));
-void       mkcatalog              PROTO((GSCRegion *region, Catalog *catalog));
+void       mkcatalog              PROTO((SkyRegion *region, Catalog *catalog));
 double     opening_angle          PROTO((double x1, double y1, double x2, double y2, double x3, double y3));
 int        parse_time             PROTO((Header *header));
@@ -165 +154 @@
 Missing *sort_missing (Average *average, int Naverage, Missing *missing, int Nmissing, int *next_miss);
 
+GSCRegion *LoadRegions            PROTO((int *nregions));
+int        FindDecBand            PROTO((double dec, double *DEC0, double *DEC1));
+int        FindRegionByPoint      PROTO((GSCRegion *regions, double ra, double dec, GSCRegion *gsc, int Ngsc));
+int        FindRegionDecBandStart PROTO((GSCRegion *region, int Nregion, double dec));
+int        FindRegionDecBandStop  PROTO((GSCRegion *region, int Nregion, double dec));
+void       aregion                PROTO((GSCRegion *region, FILE *f, double ra, double dec));
+GSCRegion *gregion_image          PROTO((Image *image, Coords *mosaic, int *Nregions));
+GSCRegion *gregion_match          PROTO((GSCRegion *regions, int *nregions));
+GSCRegion *gregion_patch          PROTO((GSCRegion *patch, int *nregions));
+void       gregion_star           PROTO((Stars *star, GSCRegion *region));
+GSCRegion *gregion_stars          PROTO((Stars *stars, int Nstars, int *Nregion));
+GSCRegion *gregions               PROTO((Image *image, int *Nregions));
+
 /** 
   there is an inconsistency to be resolved: fixed structures (like Image)
@@ -192 +194 @@
 int UpdateDatabase_Reflist (AddstarClientOptions *options, Stars *stars, int Nstars);
 int UpdateDatabase_Refcat (AddstarClientOptions *options, GSCRegion *UserPatch, char *refcat);
+
+SkyList *SkyListForStars (SkyTable *table, int depth, Stars *stars, int Nstars);
+SkyList *SkyListExistingSubset (SkyList *input);
+int SkyListSetPath (SkyList *list, char *path);