Changeset 34041 for branches/meh_branches/ppstack_test/Ohana/src/photdbc/include/photdbc.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/photdbc/include/photdbc.h (modified) (3 diffs)

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

@@ -21 +21 @@
 } StatType;
 
+int    PARALLEL;
+int    PARALLEL_MANUAL;
+int    PARALLEL_SERIAL;
+
+int          HOST_ID;
+char        *HOSTDIR;
+
 // need to get RADIUS from Config 
+
+# define DVO_MAX_PATH 1024
 
 /* global variables */
@@ -29 +38 @@
 double UNIQ_RADIUS;
 double DMCAL_MIN;;
-char   ImageCat[256];
-char   GSCFILE[256];
-char   CATDIR[256];
-char   CATMODE[16];    /* raw, mef, split, mysql */
-char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
-char   PhotCodeFile[256];
+char   ImageCat[DVO_MAX_PATH];
+char   GSCFILE[DVO_MAX_PATH];
+char   CATDIR[DVO_MAX_PATH];
+char  *CATMODE;    /* raw, mef, split, mysql */
+char  *CATFORMAT;  /* internal, elixir, loneos, panstarrs */
+char   PhotCodeFile[DVO_MAX_PATH];
 
 double RMIN;
@@ -124 +133 @@
 int copy_images (char *outdir);
 void usage();
+
+int photdbc_catalogs (char *outroot, SkyList *skylist, int hostID);
+int photdbc_parallel (char *outroot, SkyList *skylist);
+int args_client (int argc, char **argv);
+void initialize_client (int argc, char **argv);