Changeset 38651

Timestamp:

Jul 30, 2015, 5:11:38 PM (11 years ago)

Author:

eugene

Message:

add repair-by-objid

Location:

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge

Files:

• Makefile (modified) (2 diffs)
• include/dvomerge.h (modified) (2 diffs)
• src/args.c (modified) (2 diffs)
• src/dvomergeUpdate_catalogs.c (modified) (2 diffs)
• src/dvomerge_client.c (modified) (1 diff)
• src/repair_catalog_by_objID.c (added)
• src/replace_tycho.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/Makefile

@@ -51 +51 @@
 $(SRC)/replace_match.$(ARCH).o \
 $(SRC)/replace_tycho.$(ARCH).o \
+$(SRC)/repair_catalog_by_objID.$(ARCH).o \
 $(SRC)/merge_catalogs_new.$(ARCH).o \
 $(SRC)/merge_catalogs_old.$(ARCH).o
@@ -75 +76 @@
 $(SRC)/replace_match.$(ARCH).o \
 $(SRC)/replace_tycho.$(ARCH).o \
+$(SRC)/repair_catalog_by_objID.$(ARCH).o \
 $(SRC)/merge_catalogs_new.$(ARCH).o \
 $(SRC)/merge_catalogs_old.$(ARCH).o

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/include/dvomerge.h

@@ -47 +47 @@
 
 int    MATCHED_TABLES;
+int    REPAIR_BY_OBJID;
 
 char *SINGLE_CPT;
@@ -242 +243 @@
 void replace_tycho_init ();
 int  replace_tycho (Average *averageInp, Measure *measureInp, off_t *next_meas, Average *averageOut, Measure *measureOut);
+int repair_catalog_by_objID (Catalog *catalog);

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/args.c

@@ -94 +94 @@
   if ((N = get_argument (*argc, argv, "-replace-tycho"))) {
     REPLACE_TYCHO = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
+  REPAIR_BY_OBJID = FALSE;
+  if ((N = get_argument (*argc, argv, "-repair-by-objid"))) {
+    REPAIR_BY_OBJID = TRUE;
     remove_argument (N, argc, argv);
   }
@@ -266 +272 @@
   }
 
+  REPAIR_BY_OBJID = FALSE;
+  if ((N = get_argument (*argc, argv, "-repair-by-objid"))) {
+    REPAIR_BY_OBJID = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
   NTHREADS = 0;
   if ((N = get_argument (*argc, argv, "-threads"))) {

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -193 +193 @@
           outcatalog.catcompress = incatalog.catcompress;
         }
+      }
+
+      if (REPAIR_BY_OBJID) {
+        // For gpc1 / PV3, I broke some catalogs with dvomerge -replace: the last object can
+        // contaminate the first set of new measurements
+        repair_catalog_by_objID (&outcatalog);
       }
 
@@ -296 +302 @@
     if (UPDATE_CATFORMAT)    { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
     if (UPDATE_CATCOMPRESS)  { strextend (&command, "-update-catcompress %s", UPDATE_CATCOMPRESS); }
+    if (REPAIR_BY_OBJID)     { strextend (&command, "-repair-by-objid"); }
 
     // add some config variables:

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvomerge_client.c

@@ -84 +84 @@
   // loop over the populatable output tables; check for data in input in the corresponding regions
 
-  SetPhotcodeTable(NULL);
-  
   if (REPLACE_TYCHO) replace_tycho_init();
 

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/replace_tycho.c

@@ -28 +28 @@
     valid = valid || (measureOut[m].photcode == TYCHO_V);
     if (valid) { 
-      index[Nindex] = i;
+      index[Nindex] = m;
       Nindex ++;
     }