Changeset 38542 for branches/eam_branches/ipp-20150616/Ohana/src/addstar/include/addstar.h

Timestamp:

Jun 25, 2015, 8:57:58 AM (11 years ago)

Author:

eugene

Message:

removing Stars from addstar : converting to Catalog

File:

• branches/eam_branches/ipp-20150616/Ohana/src/addstar/include/addstar.h (modified) (11 diffs)

branches/eam_branches/ipp-20150616/Ohana/src/addstar/include/addstar.h

@@ -50 +50 @@
 } HeaderSet;
 
+# if (0)
 typedef struct {
   Average  average;
@@ -67 +68 @@
   char *refcat;
 } DVO_DATA;
+# endif
 
 # define IDTYPE int
@@ -212 +214 @@
 SkyTable  *SkyTableFromTychoIndex PROTO((char *filename, int VERBOSE));
 void       check_permissions      PROTO((char *basefile));
-int        dump_rawstars          PROTO((Stars *stars, unsigned int Nstars));
 int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
 Image     *fakeimage              PROTO((char *rootname, off_t *Nimage, int photcode));
 
-int        find_matches_closest          PROTO((SkyRegion *region, Catalog *newcat, Catalog *catalog, AddstarClientOptions options));
-
+double     get_subpix             PROTO((double x, double y));
+
+int        find_matches_closest   PROTO((SkyRegion *region, Catalog *newcat, Catalog *catalog, AddstarClientOptions options));
+
+# if (0)
 int        find_matches                  PROTO((SkyRegion *region, Stars *stars,  unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
-// int        find_matches_closest       PROTO((SkyRegion *region, Stars *stars,  unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
 int        find_matches_refstars         PROTO((SkyRegion *region, Stars **stars, unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
 int        find_matches_closest_refstars PROTO((SkyRegion *region, Stars **stars, unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
+
+int        dump_rawstars          PROTO((Stars *stars, unsigned int Nstars));
 
 Stars    **find_subset            PROTO((SkyRegion *region, Stars *stars, unsigned int Nstars, unsigned int *NSTARS));
 int        gcatalog               PROTO((Catalog *catalog));
 Stars     *get2mass               PROTO((SkyRegion *patch, int photcode, int mode, unsigned int *NSTARS));
-double     get_subpix             PROTO((double x, double y));
 
 Stars     *greference             PROTO((char *Refcat, SkyRegion *catstats, int photcode, unsigned int *nstars));
@@ -235 +239 @@
 // load text-based stars (REF only in the sense of REF photcodes)
 Stars     *grefstars              PROTO((char *file, int photcode, unsigned int *Nstars));
+
+Stars     *rd_gsc                 PROTO((char *filename, unsigned int *nstars));
+
+int        replace_match          PROTO((Average *average, Measure *measure, Stars *star));
+# endif
 
 Catalog   *LoadStars              PROTO((char *file, Image **images, off_t *Nimages, AddstarClientOptions *options));
@@ -250 +259 @@
 double     opening_angle          PROTO((double x1, double y1, double x2, double y2, double x3, double y3));
 int        parse_time             PROTO((Header *header));
-Stars     *rd_gsc                 PROTO((char *filename, unsigned int *nstars));
-int        replace_match          PROTO((Average *average, Measure *measure, Stars *star));
 int        resort_catalogs        PROTO((AddstarClientOptions *options, SkyTable *sky));
 int        resort_catalogs_parallel PROTO((AddstarClientOptions *options, SkyList *sky));
@@ -259 +266 @@
 void       resort_catalog_old     PROTO((Catalog *catalog));
 
+// Stars  *ReadStarsTEXT          PROTO((FILE *f, unsigned int *nstars));
+
+int        ReadImageHeader        PROTO((Header *header, Image *image, int photcode));
+
 Catalog   *ReadStarsFITS          PROTO((FILE *f, Header *header, Header *in_theader));
-Stars     *ReadStarsTEXT          PROTO((FILE *f, unsigned int *nstars));
-Stars     *ReadStarsSDSS          PROTO((FILE *f, char *name, Header *header, Header *in_theader, Image *images, off_t *nimages, unsigned int *nstars));
-int        ReadImageHeader        PROTO((Header *header, Image *image, int photcode));
 Catalog   *FilterStars            PROTO((Catalog *newcat, Image *image, unsigned int imageID, const AddstarClientOptions *options));
-// Stars     *MergeStars             PROTO((Stars *stars, unsigned int *Nstars, Stars *instars, unsigned int Ninstars));
-
 int        ReadXradFITS           PROTO((FILE *f, Header *theader, Catalog *catalog));
+
+Catalog   *LoadDataSDSS           PROTO((FILE *f, char *file, Image **images, off_t *nvalid, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t Nimages));
+Catalog   *ReadStarsSDSS          PROTO((FILE *f, char *name, Header *header, Header *in_theader, Image *images, off_t *nimages));
 
 double     scat_subpix            PROTO((double x, double y));
@@ -286 +295 @@
 AddstarClientOptions args_load2mass PROTO((int argc, char **argv, AddstarClientOptions options));
 AddstarClientOptions args_sedstar PROTO((int argc, char **argv, AddstarClientOptions options));
+
+SkyList   *SkyListExistingSubset  PROTO((SkyList *input, char *path));
+
+// these are all for the addstar client/server which has not been maintained
+# if (0)
 void       args_server            PROTO((int argc, char **argv));
 int        CheckPassword          PROTO((int BindSocket));
@@ -298 +312 @@
 int        UpdateDatabase_Refcat  PROTO((AddstarClientOptions *options, SkyRegion *UserPatch, char *refcat));
 SkyList   *SkyListForStars        PROTO((SkyTable *table, int depth, Stars *stars, unsigned int Nstars));
-SkyList   *SkyListExistingSubset  PROTO((SkyList *input, char *path));
 int        SkyListSetPath         PROTO((SkyList *list, char *path));
 int        InitDataset            PROTO((void));
@@ -307 +320 @@
 int        NewRefcat_Thread       PROTO((int BindSocket));
 int        NewReflist_Thread      PROTO((int BindSocket));
-
-int        InitStar               PROTO((Stars *star));
+# endif
 
 int args_skycells (int argc, char **argv);
@@ -317 +329 @@
 int ImageIndexFileInit ();
 
-int LoadDataSDSS (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t Nimages);
-int LoadDataPMM (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars);
+Catalog *LoadDataPMM (FILE *f, char *file, Image **images, off_t *nvalid);
 
 PhotCode *LoadMetadataPMM (char *datafile, Image *image);
@@ -340 +351 @@
 void saveMosaicCoords (Coords *input);
 
-Stars *ReadStarsUKIRT (FILE *f, char *name, Header *header, Image *images, off_t *nimages, unsigned int *nstars);
-int LoadDataUKIRT (FILE *f, char *file, Image **images, off_t *nimages, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t NheaderSets);
+Catalog *ReadStarsUKIRT (FILE *f, char *name, Header *header, Image *images, off_t *nimages);
+Catalog *LoadDataUKIRT (FILE *f, char *file, Image **images, off_t *nimages, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t NheaderSets);
 
 AddstarFile *LoadFilenames (int *nfile, char *filename, AddstarClientOptions *options);