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

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

@@ -17 +17 @@
 # include <glob.h>
 
-# define myAbort(MSG) { fprintf (stderr, "%s\n", MSG); abort(); }
-# define myAssert(LOGIC,MSG) { if (!(LOGIC)) { fprintf (stderr, "%s\n", MSG); abort(); } }
+# define DVO_MAX_PATH 1024
+
+int    PARALLEL;
+int    PARALLEL_MANUAL;
+int    PARALLEL_SERIAL;
+
+int    HOST_ID;
+char  *HOSTDIR;
+
 
 int    VERBOSE;
@@ -29 +36 @@
 int    SKY_DEPTH;
 int    NTHREADS;
-char   *ALTERNATE_PHOTCODE_FILE;
+char  *ALTERNATE_PHOTCODE_FILE;
+int    REPLACE_BY_PHOTCODE;
 
 SkyRegion UserPatch;  // used by MODE CAT
 
 typedef struct {
-  off_t Nmap;
-  off_t *old;
-  off_t *new;
+  unsigned int Nmap;
+  unsigned int *old;
+  unsigned int *new;
 } IDmapType;
 
@@ -54 +62 @@
 void       dvomerge_help          PROTO((int argc, char **argv));
 int        dvomerge_args          PROTO((int *argc, char **argv));
+
+void       dvomerge_client_usage  PROTO((void));
+void       dvomerge_client_help   PROTO((int argc, char **argv));
+int        dvomerge_client_args   PROTO((int *argc, char **argv));
 
 void       dvoconvert_usage       PROTO((void));
@@ -113 +125 @@
 int        dvomergeFromList       PROTO((int argc, char **argv));
 int        dvomergeUpdate_threaded PROTO((int argc, char **argv));
+int        dvomergeUpdate_catalogs PROTO((char *input, char *output, SkyTable *outsky, SkyList *inlist, int NsecfiltInput, int NsecfiltOutput, IDmapType *IDmap, int *secfiltMap));
+
+int        replace_match           PROTO((Average *average_out, Measure *measure_out, Average *average_in, Measure *measure_in));
+
+int        IDmapSave               PROTO((char *filename, IDmapType *IDmap));
+IDmapType *IDmapLoad               PROTO((char *filename));