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

Timestamp:

Jun 12, 2015, 10:29:47 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

File:

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

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

@@ -77 +77 @@
 
 enum {ADDSTAR_MODE_NONE, ADDSTAR_MODE_IMAGE, ADDSTAR_MODE_REFLIST, ADDSTAR_MODE_REFCAT, ADDSTAR_MODE_FAKEIMAGE, ADDSTAR_MODE_RESORT, ADDSTAR_MODE_CREATE_ID};
-enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU, SDSS_OBJ};
+enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU, SDSS_OBJ, UKIRT_OBJ};
 /* note: MEF implies CMF */
 
@@ -221 +221 @@
 Stars     *greference             PROTO((char *Refcat, SkyRegion *catstats, int photcode, unsigned int *nstars));
 Stars     *getgsc                 PROTO((SkyRegion *patch, unsigned int *NSTARS));
-Stars     *gettycho               PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
 Stars     *getusno                PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
 Stars     *getusnob               PROTO((SkyRegion *catstats, int photcode, unsigned int *Nstars));
@@ -332 +331 @@
 
 
+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);
+
 /** 
     there is an inconsistency to be resolved: fixed structures (like Image)