Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/Ohana/src/addstar/include/addstar.h

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/include/addstar.h (modified) (5 diffs)

branches/eam_branches/ps2-tc3-20130727/Ohana/src/addstar/include/addstar.h

@@ -35 +35 @@
   char *exthead;
   char *extdata;
+  char *extxrad;
   char *exttype;
   int extnum_head;
   int extnum_data;
+  int extnum_xrad;
 } HeaderSet;
 
 typedef struct {
-  Average average;
-  Measure measure;
+  Average  average;
+  Measure  measure;
+  Lensing *lensing; // optionally carry out the lensing measurements
   int found;
 } Stars;
@@ -145 +148 @@
 
 int     OLD_RESORT;
+int     READ_XRAD_DATA;
 
 int    PARALLEL;
@@ -236 +240 @@
 Stars     *rd_gsc                 PROTO((char *filename, unsigned int *nstars));
 int        replace_match          PROTO((Average *average, Measure *measure, Stars *star));
-int        resort_threaded        PROTO((AddstarClientOptions *options, SkyTable *sky));
-int        resort_unthreaded      PROTO((AddstarClientOptions *options, SkyTable *sky, int hostID, char *hostpath));
-int        resort_unthreaded_catalogs PROTO((AddstarClientOptions *options, SkyList *skylist, int hostID, char *hostpath));
+int        resort_catalogs        PROTO((AddstarClientOptions *options, SkyTable *sky));
+int        resort_catalogs_parallel PROTO((AddstarClientOptions *options, SkyList *sky));
+int        resort_threaded        PROTO((SkyList *skylist, int ForceSort));
+int        resort_unthreaded      PROTO((SkyList *skylist, int ForceSort));
 void       resort_catalog         PROTO((Catalog *catalog));
 void       resort_catalog_old     PROTO((Catalog *catalog));
+
 Stars     *ReadStarsFITS          PROTO((FILE *f, Header *header, Header *in_theader, unsigned int *nstars));
 Stars     *ReadStarsTEXT          PROTO((FILE *f, unsigned int *nstars));
@@ -247 +253 @@
 Stars     *FilterStars            PROTO((Stars *instars, 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, Stars *stars, unsigned int Nstars));
+
 double     scat_subpix            PROTO((double x, double y));
 void       update_coords          PROTO((Average *average, Measure *measure, off_t *next));
 off_t     *init_measure_links     PROTO((Average *average, off_t Naverage, Measure *measure, off_t Nmeasure));
+off_t     *init_lensing_links     PROTO((Average *average, off_t Naverage, Lensing *lensing, off_t Nlensing));
 off_t     *init_missing_links     PROTO((Average *average, off_t Naverage, Missing *missing, off_t Nmissing));
-off_t      add_meas_link          PROTO((Average *average, off_t *next_meas, off_t Nmeasure, off_t NMEASURE));
-off_t      add_miss_link          PROTO((Average *average, off_t *next_miss, off_t Nmissing));
+int        add_meas_link          PROTO((Average *average, off_t *next_meas, off_t Nmeasure, off_t NMEASURE));
+int        add_miss_link          PROTO((Average *average, off_t *next_miss, off_t Nmissing));
+int        add_lens_link          PROTO((Average *average, off_t *next_lens, off_t Nlensing, off_t NLENSING));
 off_t     *build_measure_links    PROTO((Average *average, off_t Naverage, Measure *measure, off_t Nmeasure));
+off_t     *build_lensing_links    PROTO((Average *average, off_t Naverage, Lensing *lensing, off_t Nlensing));
 Measure   *sort_measure           PROTO((Average *average, off_t Naverage, Measure *measure, off_t Nmeasure, off_t *next_meas));
 Missing   *sort_missing           PROTO((Average *average, off_t Naverage, Missing *missing, off_t Nmissing, off_t *next_miss));
+Lensing   *sort_lensing           PROTO((Average *average, off_t Naverage, Lensing *lensing, off_t Nlensing, off_t *next_lens));
 int        ImageOptions           PROTO((AddstarClientOptions *options, Image *images, off_t Nimages));
 int        GetFileMode            PROTO((Header *header));
@@ -311 +324 @@
 void *memrchr(const void *s, int c, size_t n);
 int addstar_create_ID ();
+int strextend (char *input, char *format,...);
 
 /**