Changeset 38468 for trunk

Timestamp:

Jun 12, 2015, 10:30:41 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

Location:

trunk/Ohana/src/dvomerge

Files:

• Makefile (modified) (2 diffs)
• include/dvomerge.h (modified) (2 diffs)
• src/args.c (modified) (2 diffs)
• src/dvomergeUpdate.c (modified) (1 diff)
• src/dvomergeUpdate_catalogs.c (modified) (3 diffs)
• src/dvorepairDeleteImagesByExternID.c (modified) (1 diff)
• src/dvosecfilt_catalogs.c (modified) (1 diff)
• src/merge_catalogs_old.c (modified) (2 diffs)
• src/replace_tycho.c (copied) (copied from branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/replace_tycho.c )

trunk/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

trunk/Ohana/src/dvomerge/include/dvomerge.h

@@ -40 +40 @@
 char  *ALTERNATE_PHOTCODE_FILE;
 int    REPLACE_BY_PHOTCODE;
+int    REPLACE_TYCHO;
 int    FORCE_MERGE;
 int    MAX_CLIENTS;
@@ -232 +233 @@
 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);

trunk/Ohana/src/dvomerge/src/args.c

@@ -83 +83 @@
   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);
   }
@@ -240 +247 @@
   }
 
+  /* 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"))) {

trunk/Ohana/src/dvomerge/src/dvomergeUpdate.c

@@ -43 +43 @@
   inputPhotcodes = GetPhotcodeTable();
   NsecfiltInput = GetPhotcodeNsecfilt();
+
+  if (REPLACE_TYCHO) replace_tycho_init();
 
   // since we are merging the input db into the output db, the output defines the photcode

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

@@ -1 +1 @@
 # include "dvomerge.h"
 # define DEBUG 1
+# define MACHINE_GROUPS 1
 
 // in parallel mode, the target database may be distributed, while the input database is
@@ -9 +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_catalogs (char *input, char *output, SkyTable *outsky, SkyList *inlist, int NsecfiltInput, int NsecfiltOutput, IDmapType *IDmap, int *secfiltMap) {
@@ -293 +296 @@
     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); }

trunk/Ohana/src/dvomerge/src/dvorepairDeleteImagesByExternID.c

@@ -728 +728 @@
 
     for (i = 0; i < Nrows; i++) {
-      dvo_secfilt_init (&secfilt[i]);
+      dvo_secfilt_init (&secfilt[i], SECFILT_RESET_ALL);
     }
 

trunk/Ohana/src/dvomerge/src/dvosecfilt_catalogs.c

@@ -71 +71 @@
       }
       for (j = Nstart; j < Nsecfilt; j++) {
-        dvo_secfilt_init (&outsec[k*Nsecfilt + j]);
+        dvo_secfilt_init (&outsec[k*Nsecfilt + j], SECFILT_RESET_ALL);
       }
     }

trunk/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) {
+        input[0].found_t[N] = Nmeas;
+        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;
 
@@ -375 +388 @@
     for (j = 0; j < NsecfiltOut; j++) {
         int outputIndex = (Nave * NsecfiltOut) + j;
-        dvo_secfilt_init (&output[0].secfilt[outputIndex]);
+        dvo_secfilt_init (&output[0].secfilt[outputIndex], SECFILT_RESET_ALL);
     }