Changeset 38470 for trunk

Timestamp:

Jun 13, 2015, 5:57:53 AM (11 years ago)

Author:

eugene

Message:

fix minor merge typos

Location:

trunk/Ohana/src

Files:

• addstar/src/loadtycho_rawdata.c (modified) (1 diff)
• dvomerge/src/dvomergeUpdate_catalogs.c (modified) (2 diffs)
• relphot/src/reload_catalogs.c (modified) (1 diff)
• relphot/src/relphot_objects.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/loadtycho_rawdata.c

@@ -131 +131 @@
       catalog.catformat = dvo_catalog_catformat (CATFORMAT);  // set the default catformat from config data
       catalog.catmode   = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
-      catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
+      catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_LENSING;
       catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 

trunk/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -10 +10 @@
 
 int dvomergeUpdate_parallel (char *input, char *output, SkyTable *outsky, IDmapType *IDmap);
-int dvomergeUpdate_parallel_group (HostTableGroup *group, char *absinput, char *absoutput, SkyTable *sky);
-int dvomergeUpdate_parallel_table (HostTable *table, char *absinput, char *absoutput);
+int dvomergeUpdate_parallel_group (HostTableGroup *group, char *absinput, char *absoutput);
 
 int dvomergeUpdate_catalogs (char *input, char *output, SkyTable *outsky, SkyList *inlist, int NsecfiltInput, int NsecfiltOutput, IDmapType *IDmap, int *secfiltMap) {
@@ -233 +232 @@
   return TRUE;
 }
-
-int dvomergeUpdate_parallel_group (HostTableGroup *group, char *absinput, char *absoutput);
 
 // launch the dvomergeUpdate_client jobs to the parallel hosts

trunk/Ohana/src/relphot/src/reload_catalogs.c

@@ -234 +234 @@
     // MIN_ERROR
     
-    if (VERBOSE)          { strextend (&command, "-v"); }
-    if (VERBOSE2)         { strextend (&command, "-vv"); }
-    if (RESET)            { strextend (&command, "-reset"); }
-    if (RESET_ZEROPTS)    { strextend (&command, "-reset-zpts"); }
-    if (UPDATE)           { strextend (&command, "-update"); }
-    if (IS_DIFF_DB)       { strextend (&command, "-is-diff-db"); }
-    if (!KEEP_UBERCAL)    { strextend (&command, "-reset-ubercal"); }
-    if (UPDATE_CATFORMAT) { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
-    if (BOUNDARY_TREE)    { strextend (&command, "-boundary-tree %s", BOUNDARY_TREE); }
-    if (SYNTH_ZERO_POINTS) { strextend {&command, "-synthphot-zpts %s", SYNTH_ZERO_POINTS); }
+    if (VERBOSE)           { strextend (&command, "-v"); }
+    if (VERBOSE2)          { strextend (&command, "-vv"); }
+    if (RESET)             { strextend (&command, "-reset"); }
+    if (RESET_ZEROPTS)     { strextend (&command, "-reset-zpts"); }
+    if (UPDATE)            { strextend (&command, "-update"); }
+    if (IS_DIFF_DB)        { strextend (&command, "-is-diff-db"); }
+    if (!KEEP_UBERCAL)     { strextend (&command, "-reset-ubercal"); }
+    if (UPDATE_CATFORMAT)  { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
+    if (BOUNDARY_TREE)     { strextend (&command, "-boundary-tree %s", BOUNDARY_TREE); }
+    if (SYNTH_ZERO_POINTS) { strextend (&command, "-synthphot-zpts %s", SYNTH_ZERO_POINTS); }
 
     // deprecate

trunk/Ohana/src/relphot/src/relphot_objects.c

@@ -148 +148 @@
               table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, STATMODE, CAMERA, STAR_TOOFEW, MIN_ERROR);
 
-    if (VERBOSE)       { strextend (&command, "-v"); }
-    if (VERBOSE2)      { strextend (&command, "-vv"); }
-    if (RESET)         { strextend (&command, "-reset"); }
-    if (RESET_ZEROPTS) { strextend (&command, "-reset-zpts"); }
-    if (UPDATE)        { strextend (&command, "-update"); }
-    if (!KEEP_UBERCAL) { strextend (&command, "-reset-ubercal"); }
-    if (SYNTH_ZERO_POINTS) { snprintf (tmpline, 1024, "%s -synthphot-zpts %s", command, SYNTH_ZERO_POINTS); strcpy (command, tmpline); }
+    if (VERBOSE)           { strextend (&command, "-v"); }
+    if (VERBOSE2)          { strextend (&command, "-vv"); }
+    if (RESET)             { strextend (&command, "-reset"); }
+    if (RESET_ZEROPTS)     { strextend (&command, "-reset-zpts"); }
+    if (UPDATE)            { strextend (&command, "-update"); }
+    if (!KEEP_UBERCAL)     { strextend (&command, "-reset-ubercal"); }
+    if (SYNTH_ZERO_POINTS) { strextend (&command, "-synthphot-zpts %s", SYNTH_ZERO_POINTS); }
 
     // if (SET_MREL_VERSION != 1) { strextend (&command, "-set-mrel-version %d", SET_MREL_VERSION); }