IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 25, 2015, 10:41:05 PM (11 years ago)
Author:
eugene
Message:

merge changes from branches/eam_branches/ipp-20150616

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r38467 r38553  
    3333
    3434# define myAbortF(FORMAT,...) { fprintf (stderr, FORMAT, __VA_ARGS__); abort(); }
     35
     36// things that are needed for a single file
     37typedef struct {
     38  char *filename;  // name of the file on disk (full path)
     39  char *imagename; // name of the image for user reference (eg, base of neb path, full path, etc)
     40} AddstarFile;
    3541
    3642typedef struct {
    … …  
    4450} HeaderSet;
    4551
     52# if (0)
    4653typedef struct {
    4754  Average  average;
    … …  
    6168  char *refcat;
    6269} DVO_DATA;
     70# endif
    6371
    6472# define IDTYPE int
    … …  
    190198AddstarClientOptions args                 PROTO((int argc, char **argv, AddstarClientOptions options));
    191199AddstarClientOptions args_parallel_client PROTO((int argc, char **argv, AddstarClientOptions options));
     200void FreeConfig PROTO((void));
    192201
    193202void       AddToCalibration       PROTO((Average *average, SecFilt *secfilt, Measure *measure, Measure *new, off_t *next, off_t Nstar));
    … …  
    205214SkyTable  *SkyTableFromTychoIndex PROTO((char *filename, int VERBOSE));
    206215void       check_permissions      PROTO((char *basefile));
    207 int        dump_rawstars          PROTO((Stars *stars, unsigned int Nstars));
    208216int        edge_check             PROTO((double *x1, double *y1, double *x2, double *y2));
    209217Image     *fakeimage              PROTO((char *rootname, off_t *Nimage, int photcode));
    210218
    211 int        find_matches                  PROTO((SkyRegion *region, Stars *stars,  unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
    212 int        find_matches_closest          PROTO((SkyRegion *region, Stars *stars,  unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
     219double     get_subpix             PROTO((double x, double y));
     220
     221int        find_matches_closest   PROTO((SkyRegion *region, Catalog *newcat, Catalog *catalog, AddstarClientOptions options));
     222int        find_matches           PROTO((SkyRegion *region, Catalog *newcat, Catalog *catalog, AddstarClientOptions options));
     223
     224# if (0)
    213225int        find_matches_refstars         PROTO((SkyRegion *region, Stars **stars, unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
    214226int        find_matches_closest_refstars PROTO((SkyRegion *region, Stars **stars, unsigned int Nstars, Catalog *catalog, AddstarClientOptions options));
     227
     228int        dump_rawstars          PROTO((Stars *stars, unsigned int Nstars));
    215229
    216230Stars    **find_subset            PROTO((SkyRegion *region, Stars *stars, unsigned int Nstars, unsigned int *NSTARS));
    217231int        gcatalog               PROTO((Catalog *catalog));
    218232Stars     *get2mass               PROTO((SkyRegion *patch, int photcode, int mode, unsigned int *NSTARS));
    219 double     get_subpix             PROTO((double x, double y));
    220233
    221234Stars     *greference             PROTO((char *Refcat, SkyRegion *catstats, int photcode, unsigned int *nstars));
    … …  
    227240Stars     *grefstars              PROTO((char *file, int photcode, unsigned int *Nstars));
    228241
    229 Stars     *LoadStars              PROTO((char *file, unsigned int *Nstars, Image **images, off_t *Nimages, AddstarClientOptions *options));
     242Stars     *rd_gsc                 PROTO((char *filename, unsigned int *nstars));
     243
     244int        replace_match          PROTO((Average *average, Measure *measure, Stars *star));
     245# endif
     246
     247Catalog   *LoadStars              PROTO((char *file, Image **images, off_t *Nimages, AddstarClientOptions *options));
    230248Header   **LoadHeaders            PROTO((FILE *f, int *mode, int *Nheader));
    231249HeaderSet *MatchHeaders           PROTO((off_t **extsize, off_t *nimage, int mode, Header **headers, int Nheaders));
    232 int        LoadData               PROTO((FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars, Header **headers, off_t *extsize, HeaderSet *headerSets, int NheaderSets, AddstarClientOptions *options));
     250void       HeaderSetFree          PROTO((HeaderSet *headerSets, off_t NheaderSets));
     251Catalog   *LoadData               PROTO((FILE *f, AddstarFile *file, Image **images, off_t *nvalid, Header **headers, off_t *extsize, HeaderSet *headerSets, int NheaderSets, AddstarClientOptions *options));
    233252int        GetZeroPointExposure   PROTO((Header **headers, HeaderSet *headerSets, off_t Nimages));
    234253
    … …  
    240259double     opening_angle          PROTO((double x1, double y1, double x2, double y2, double x3, double y3));
    241260int        parse_time             PROTO((Header *header));
    242 Stars     *rd_gsc                 PROTO((char *filename, unsigned int *nstars));
    243 int        replace_match          PROTO((Average *average, Measure *measure, Stars *star));
    244261int        resort_catalogs        PROTO((AddstarClientOptions *options, SkyTable *sky));
    245262int        resort_catalogs_parallel PROTO((AddstarClientOptions *options, SkyList *sky));
    … …  
    249266void       resort_catalog_old     PROTO((Catalog *catalog));
    250267
    251 Stars     *ReadStarsFITS          PROTO((FILE *f, Header *header, Header *in_theader, unsigned int *nstars));
    252 Stars     *ReadStarsTEXT          PROTO((FILE *f, unsigned int *nstars));
    253 Stars     *ReadStarsSDSS          PROTO((FILE *f, char *name, Header *header, Header *in_theader, Image *images, off_t *nimages, unsigned int *nstars));
     268// Stars  *ReadStarsTEXT          PROTO((FILE *f, unsigned int *nstars));
     269
    254270int        ReadImageHeader        PROTO((Header *header, Image *image, int photcode));
    255 Stars     *FilterStars            PROTO((Stars *instars, Image *image, unsigned int imageID, const AddstarClientOptions *options));
    256 Stars     *MergeStars             PROTO((Stars *stars, unsigned int *Nstars, Stars *instars, unsigned int Ninstars));
    257 
    258 int        ReadXradFITS           PROTO((FILE *f, Header *theader, Stars *stars, unsigned int Nstars));
     271
     272Catalog   *ReadStarsFITS          PROTO((FILE *f, Header *header, Header *in_theader));
     273Catalog   *FilterStars            PROTO((Catalog *newcat, Image *image, unsigned int imageID, const AddstarClientOptions *options));
     274int        ReadXradFITS           PROTO((FILE *f, Header *theader, Catalog *catalog));
     275
     276Catalog   *LoadDataSDSS           PROTO((FILE *f, char *file, Image **images, off_t *nvalid, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t Nimages));
     277Catalog   *ReadStarsSDSS          PROTO((FILE *f, char *name, Header *header, Header *in_theader, Image *images, off_t *nimages));
    259278
    260279double     scat_subpix            PROTO((double x, double y));
    … …  
    276295AddstarClientOptions args_load2mass PROTO((int argc, char **argv, AddstarClientOptions options));
    277296AddstarClientOptions args_sedstar PROTO((int argc, char **argv, AddstarClientOptions options));
     297
     298SkyList   *SkyListExistingSubset  PROTO((SkyList *input, char *path));
     299
     300// these are all for the addstar client/server which has not been maintained
     301# if (0)
    278302void       args_server            PROTO((int argc, char **argv));
    279303int        CheckPassword          PROTO((int BindSocket));
    … …  
    288312int        UpdateDatabase_Refcat  PROTO((AddstarClientOptions *options, SkyRegion *UserPatch, char *refcat));
    289313SkyList   *SkyListForStars        PROTO((SkyTable *table, int depth, Stars *stars, unsigned int Nstars));
    290 SkyList   *SkyListExistingSubset  PROTO((SkyList *input, char *path));
    291314int        SkyListSetPath         PROTO((SkyList *list, char *path));
    292315int        InitDataset            PROTO((void));
    … …  
    297320int        NewRefcat_Thread       PROTO((int BindSocket));
    298321int        NewReflist_Thread      PROTO((int BindSocket));
    299 
    300 int        InitStar               PROTO((Stars *star));
     322# endif
    301323
    302324int args_skycells (int argc, char **argv);
    303325int ConfigInit_skycells (int *argc, char **argv);
    304 int UpdateImageIDs (Stars *stars, unsigned int Nstars, Image *images, off_t Nimages);
     326int UpdateImageIDs (Catalog *catalog, Image *images, off_t Nimages);
    305327
    306328int CheckDuplicateImageIDs (Image *images, off_t Nimages);
    307329int ImageIndexFileInit ();
    308330
    309 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);
    310 int LoadDataPMM (FILE *f, char *file, Image **images, off_t *nvalid, Stars **stars, unsigned int *Nstars);
     331Catalog *LoadDataPMM (FILE *f, char *file, Image **images, off_t *nvalid);
    311332
    312333PhotCode *LoadMetadataPMM (char *datafile, Image *image);
    … …  
    330351void saveMosaicCoords (Coords *input);
    331352
    332 
    333 Stars *ReadStarsUKIRT (FILE *f, char *name, Header *header, Image *images, off_t *nimages, unsigned int *nstars);
    334 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);
     353Catalog *ReadStarsUKIRT (FILE *f, char *name, Header *header, Image *images, off_t *nimages);
     354Catalog *LoadDataUKIRT (FILE *f, char *file, Image **images, off_t *nimages, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t NheaderSets);
     355
     356AddstarFile *LoadFilenames (int *nfile, char *filename, AddstarClientOptions *options);
     357void AddstarFileFree (AddstarFile *file, int Nfile);
     358
     359Catalog *addstar_catalog_init (int Nstars);
    335360
    336361/**
Note: See TracChangeset for help on using the changeset viewer.