Changeset 39487

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

Location:

trunk/Ohana/src/dvolens

Files:

• Makefile (modified) (2 diffs)
• include/dvolens.h (modified) (3 diffs)
• src/ConfigInit.c (modified) (1 diff)
• src/WarpImageMaps.c (added)
• src/args.c (modified) (2 diffs)
• src/dvolens.c (modified) (1 diff)
• src/dvolens_client.c (modified) (1 diff)
• src/load_images.c (added)
• src/select_images.c (added)
• src/update_objects.c (modified) (4 diffs)
• src/update_objects_catalog.c (modified) (1 diff)

trunk/Ohana/src/dvolens/Makefile

@@ -23 +23 @@
 
 DVOLENS = \
+$(SRC)/load_images.$(ARCH).o     \
+$(SRC)/select_images.$(ARCH).o   \
+$(SRC)/WarpImageMaps.$(ARCH).o   \
 $(SRC)/ConfigInit.$(ARCH).o      \
 $(SRC)/SetSignals.$(ARCH).o      \
@@ -39 +42 @@
 
 DVOLENS_CLIENT = \
+$(SRC)/load_images.$(ARCH).o     \
+$(SRC)/select_images.$(ARCH).o   \
+$(SRC)/WarpImageMaps.$(ARCH).o   \
 $(SRC)/ConfigInit.$(ARCH).o      \
 $(SRC)/SetSignals.$(ARCH).o      \

trunk/Ohana/src/dvolens/include/dvolens.h

@@ -27 +27 @@
 char   CATMODE[16];    /* raw, mef, split, mysql */
 char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
+char   ImageCat[DVO_MAX_PATH];
 
 int    HOST_ID;
@@ -39 +40 @@
 int    UPDATE;
 int    NTHREADS;
+
+int    REPAIR_LENSING_IDS;
 
 DvoLensMode MODE;
@@ -82 +85 @@
 int myIndexSetEntry (myIndexType *myIndex, int value, int entry);
 int myIndexGetEntry (myIndexType *myIndex, int value);
+
+int FindWarpGroups (void);
+int RecoverLensingIndex (Average *average, myIndexType *measureIndex, Lensing *lensing);
+void FreeWarpGroups (void);
+
+int isGPC1warp (int photcode);
+
+Image *select_images (SkyList *skylist, Image *timage, off_t Ntimage, off_t *Nimage);
+
+int load_images (SkyList *skylist);
+void free_images (void);
+Image *getimages (off_t *N);
+off_t getImageByID (off_t ID);
+

trunk/Ohana/src/dvolens/src/ConfigInit.c

@@ -21 +21 @@
   CATDIR = abspath (tmpcatdir, DVO_MAX_PATH);
   free (tmpcatdir);
+
+  snprintf (ImageCat, DVO_MAX_PATH, "%s/Images.dat", CATDIR);
 
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);

trunk/Ohana/src/dvolens/src/args.c

@@ -37 +37 @@
   if ((N = get_argument (argc, argv, "-vv"))) {
     VERBOSE2 = VERBOSE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
+  REPAIR_LENSING_IDS = FALSE;
+  if ((N = get_argument (argc, argv, "-repair-lensing-ids"))) {
+    REPAIR_LENSING_IDS = TRUE;
     remove_argument (N, &argc, argv);
   }
@@ -162 +168 @@
   }
 
+  REPAIR_LENSING_IDS = FALSE;
+  if ((N = get_argument (argc, argv, "-repair-lensing-ids"))) {
+    REPAIR_LENSING_IDS = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
   UPDATE = FALSE;
   if ((N = get_argument (argc, argv, "-update"))) {

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

@@ -13 +13 @@
       FREE (UserCatalog);
       FREE (CATDIR);
+      free_images();
+      FreeWarpGroups();
       ohana_memcheck (VERBOSE);
       ohana_memdump (VERBOSE);

trunk/Ohana/src/dvolens/src/dvolens_client.c

@@ -19 +19 @@
       FREE (HOSTDIR);
       FREE (CATDIR);
+      free_images();
+      FreeWarpGroups();
       ohana_memcheck (VERBOSE);
       ohana_memdump (VERBOSE);

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);
 }      

trunk/Ohana/src/dvolens/src/update_objects_catalog.c

@@ -83 +83 @@
 
       Mj = myIndexGetEntry (measureIndex, lensing->imageID);
+
+      // if we are unable to find a match in the measure table, we may have the wrong 
+      // imageID.  there was a bug in which we only matched to the correct warp obstime,
+      // but got the wrong skycell.  if this is the case, we can try to recover by finding
+      // the set of warps which match our obstime, then choosing the one from that set
+      // which matches one of our warps.
+      if ((Mj < 0) && REPAIR_LENSING_IDS) {
+        Mj = RecoverLensingIndex (average, measureIndex, lensing);
+      }
       myAssert (Mj > -1, "missing index");