Changeset 39487 for trunk/Ohana/src/dvolens/src/update_objects.c

Timestamp:

Mar 27, 2016, 3:21:04 PM (10 years ago)

Author:

eugene

Message:

adding option to repair the lensing.imageID based on the warp measure.imageID values

File:

• trunk/Ohana/src/dvolens/src/update_objects.c (modified) (4 diffs)

trunk/Ohana/src/dvolens/src/update_objects.c

@@ -37 +37 @@
 
   if (VERBOSE) fprintf (stderr, "re-loading catalog data\n");
+
+  // XXX I need to load enough of the images to load the warp groups
+
+  if (REPAIR_LENSING_IDS) {
+    load_images (skylist);
+    FindWarpGroups();
+  }
 
   /* load data from each region file */
@@ -150 +157 @@
     table->hosts[i].pathname = tmppath;
 
-    char command[1024];
-    snprintf (command, 1024, "dvolens_client -update-objects -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f", 
-              table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, 
-              UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
-
-    // options & configs which affect dvolens_client -update-catalogs
+    char *command = NULL;
+    strextend (&command, "dvolens_client -update-objects");
+    strextend (&command, "-hostID %d", table->hosts[i].hostID);
+    strextend (&command, "-D CATDIR %s", CATDIR);
+    strextend (&command, "-hostdir %s", table->hosts[i].pathname);
+    strextend (&command, "-region %f %f %f %f", UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
+
+    // options & configs which affect dvolens_client -update-catalogs:
     // VERBOSE, VERBOSE2, UPDATE
-    
-    char tmpline[1024];
-    if (VERBOSE)          { snprintf (tmpline, 1024, "%s -v",                   command);                                         strcpy (command, tmpline); }
-    if (VERBOSE2)         { snprintf (tmpline, 1024, "%s -vv",                  command);                                         strcpy (command, tmpline); }
-    if (UPDATE)           { snprintf (tmpline, 1024, "%s -update",              command);                                         strcpy (command, tmpline); }
+
+    if (VERBOSE)            strextend (&command, "-v");
+    if (VERBOSE2)           strextend (&command, "-vv");
+    if (UPDATE)             strextend (&command, "-update");
+    if (REPAIR_LENSING_IDS) strextend (&command, "-repair-lensing-ids");
 
     fprintf (stderr, "command: %s\n", command);
 
     if (PARALLEL_MANUAL) { 
+      free (command);
       continue;
     }
@@ -185 +195 @@
       table->hosts[i].pid = pid; // save for future reference
     }
+    free (command);
   }
 
@@ -198 +209 @@
     }
   }
+
+  FreeHostTable (table);
   return (TRUE);
 }