Changeset 38285

Timestamp:

May 16, 2015, 12:02:23 PM (11 years ago)

Author:

eugene

Message:

add -replace-tycho option

Location:

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

Files:

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

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

@@ -50 +50 @@
 $(SRC)/build_links.$(ARCH).o \
 $(SRC)/replace_match.$(ARCH).o \
+$(SRC)/replace_tycho.$(ARCH).o \
 $(SRC)/merge_catalogs_new.$(ARCH).o \
 $(SRC)/merge_catalogs_old.$(ARCH).o
@@ -73 +74 @@
 $(SRC)/build_links.$(ARCH).o \
 $(SRC)/replace_match.$(ARCH).o \
+$(SRC)/replace_tycho.$(ARCH).o \
 $(SRC)/merge_catalogs_new.$(ARCH).o \
 $(SRC)/merge_catalogs_old.$(ARCH).o

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

@@ -40 +40 @@
 char  *ALTERNATE_PHOTCODE_FILE;
 int    REPLACE_BY_PHOTCODE;
+int    REPLACE_TYCHO;
 int    FORCE_MERGE;
 char  *UPDATE_CATFORMAT;
@@ -230 +231 @@
 int RepairTableCPT_V1(char *cptFilenameSrc, char *cptFilenameTgt, char *cpsFilenameSrc, char *cpsFilenameTgt, Measure *measure, off_t Nmeasure, Image *image, off_t Nimage, myIndexType *imageIDindex, char catformat);
 int *ReadDeleteListExternID(char *filename, int *nindex);
+
+void replace_tycho_init ();
+int  replace_tycho (Average *averageInp, Measure *measureInp, Average *averageOut, Measure *measureOut);

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

@@ -69 +69 @@
   if ((N = get_argument (*argc, argv, "-replace"))) {
     REPLACE_BY_PHOTCODE = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
+  /* replace measurement, don't duplicate */
+  REPLACE_TYCHO = FALSE;
+  if ((N = get_argument (*argc, argv, "-replace-tycho"))) {
+    REPLACE_TYCHO = TRUE;
     remove_argument (N, argc, argv);
   }
@@ -220 +227 @@
   }
 
+  /* replace measurement, don't duplicate */
+  REPLACE_TYCHO = FALSE;
+  if ((N = get_argument (*argc, argv, "-replace-tycho"))) {
+    REPLACE_TYCHO = TRUE;
+    remove_argument (N, argc, argv);
+  }
+
   NTHREADS = 0;
   if ((N = get_argument (*argc, argv, "-threads"))) {

branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomerge.c

@@ -7 +7 @@
   ConfigInit (&argc, argv);
   dvomerge_args (&argc, argv);
+  replace_tycho_init();
 
   if (argc == 6) {

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

@@ -297 +297 @@
     if (VERIFY_CATALOG_ONLY) { snprintf (tmpline, DVO_MAX_PATH, "%s -verify-catalogs",  command); strcpy (command, tmpline); }
     if (REPLACE_BY_PHOTCODE) { snprintf (tmpline, DVO_MAX_PATH, "%s -replace",          command); strcpy (command, tmpline); }
+    if (REPLACE_TYCHO)       { snprintf (tmpline, DVO_MAX_PATH, "%s -replace-tycho",    command); strcpy (command, tmpline); }
     if (PARALLEL_INPUT)      { snprintf (tmpline, DVO_MAX_PATH, "%s -parallel-input",   command); strcpy (command, tmpline); }
     if (FORCE_MERGE)         { snprintf (tmpline, DVO_MAX_PATH, "%s -force-merge",      command); strcpy (command, tmpline); }

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

@@ -6 +6 @@
   ConfigInit (&argc, argv);
   dvomerge_client_args (&argc, argv);
+  replace_tycho_init();
 
   SkyTable *outsky, *insky;

branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -196 +196 @@
     // 4) average properties from the input and the output db need to be properly merged.
 
+    int Nreplace = 0;
+    if (REPLACE_TYCHO) {
+      int Mout = output[0].average[n].measureOffset;  
+      int Minp =  input[0].average[N].measureOffset;
+      Nreplace = replace_tycho (&output[0].average[n], &output[0].measure[Mout], &input[0].average[N], &input[0].measure[Minp]);
+      if (Nreplace == 6) {
+        output[0].found_t[n] = Nmeas;
+        i++;
+        continue;
+      }
+    }
+
     /** add ALL measurements for this input average object **/
-    for (Nin = 0; Nin < input[0].average[N].Nmeasure; Nin ++) {
+    for (Nin = Nreplace; Nin < input[0].average[N].Nmeasure; Nin ++) {
       offset = input[0].average[N].measureOffset + Nin;