Changeset 34041 for branches/meh_branches/ppstack_test/Ohana/src/addstar/include/addstar.h

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

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

branches/meh_branches/ppstack_test/Ohana/src/addstar/include/addstar.h

@@ -28 +28 @@
     fprintf (stderr, "ERROR:  photcode %s not found in photcode table\n", NAME); \
     exit (0); }
+
+# define dCOS(A)   ((double) cos ((double)RAD_DEG*A))
+# define dSIN(A)   ((double) sin ((double)RAD_DEG*A))
 
 typedef struct {
@@ -56 +59 @@
 typedef struct sockaddr_in SockAddress;
 
-enum {M_IMAGE, M_REFLIST, M_REFCAT, M_FAKEIMAGE, M_RESORT};
+enum {ADDSTAR_MODE_NONE, ADDSTAR_MODE_IMAGE, ADDSTAR_MODE_REFLIST, ADDSTAR_MODE_REFCAT, ADDSTAR_MODE_FAKEIMAGE, ADDSTAR_MODE_RESORT};
 enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU, SDSS_OBJ};
 /* note: MEF implies CMF */
 
 /* globals which define database info / data sources (KEEP) */
-char   ImageCat[256];
+char   ImageCat[DVO_MAX_PATH];
 char   GSCFILE[256];
-char   CATDIR[256];
+char  *CATDIR;
 char   CATMODE[16];    /* raw, mef, split, mysql */
 char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
@@ -129 +132 @@
 int     OLD_RESORT;
 
+int    PARALLEL;
+int    PARALLEL_MANUAL;
+int    PARALLEL_SERIAL;
+int    HOST_ID;
+char  *HOSTDIR;
+
 // carries the mosaic into gstars
 
@@ -157 +166 @@
 /*** addstar prototypes ***/
 
-AddstarClientOptions ConfigInit   PROTO((int *argc, char **argv));
-AddstarClientOptions args         PROTO((int argc, char **argv, AddstarClientOptions options));
+AddstarClientOptions ConfigInit           PROTO((int *argc, char **argv));
+AddstarClientOptions args                 PROTO((int argc, char **argv, AddstarClientOptions options));
+AddstarClientOptions args_parallel_client PROTO((int argc, char **argv, AddstarClientOptions options));
 
 void       AddToCalibration       PROTO((Average *average, SecFilt *secfilt, Measure *measure, Measure *new, off_t *next, off_t Nstar));
@@ -213 +223 @@
 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        resort_unthreaded      PROTO((AddstarClientOptions *options, SkyTable *sky, int hostID, char *hostpath));
+int        resort_unthreaded_catalogs PROTO((AddstarClientOptions *options, SkyList *skylist, int hostID, char *hostpath));
 void       resort_catalog         PROTO((Catalog *catalog));
 void       resort_catalog_old     PROTO((Catalog *catalog));