Changeset 30118 for branches/czw_branch/20101203/Ohana/src/addstar/include/addstar.h

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

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

branches/czw_branch/20101203/Ohana/src/addstar/include/addstar.h

@@ -125 +125 @@
 float   ZPT_ERR_PHU;
 
+int     OLD_RESORT;
+
 // carries the mosaic into gstars
 
@@ -135 +137 @@
 double MIN_FWHM_X;
 double MIN_FWHM_Y;
+int    NTHREADS;
 
 /* modify server behavior (make this an addstar cleanup mode?) */
@@ -207 +210 @@
 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));
 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));