Changeset 38286

Timestamp:

May 16, 2015, 1:14:29 PM (11 years ago)

Author:

eugene

Message:

fix dvomerge -replace-tycho to address broken tycho ingest

Location:

branches/eam_branches/ipp-20150419/Ohana/src

Files:

• dvomerge/src/dvomerge.c (modified) (1 diff)
• dvomerge/src/dvomergeUpdate.c (modified) (1 diff)
• dvomerge/src/dvomerge_client.c (modified) (1 diff)
• dvomerge/src/merge_catalogs_old.c (modified) (1 diff)
• dvomerge/src/replace_tycho.c (modified) (2 diffs)
• libohana/Makefile (modified) (1 diff)

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.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

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

@@ -202 +202 @@
       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++;

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

@@ -10 +10 @@
 }
 
-int replace_tycho (Average *averageInp, Measure *measureInp, Average *averageOut, Measure *measureOut) {
+int replace_tycho (Average *averageOut, Measure *measureOut, Average *averageInp, Measure *measureInp) {
 
   int i;
@@ -29 +29 @@
   }
 
-  if (Nindex != 6) {
-    fprintf (stderr, "did not find all tycho measurements? (Nindex = %d)\n", Nindex);
+  if ((Nindex != 0) && (Nindex != 6)) {
+    fprintf (stderr, "unexpected number of tycho measurements: (Nindex = %d)\n", Nindex);
   }
 

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

@@ -30 +30 @@
 $(SRC)/ohana_allocate.$(ARCH).o  \
 $(SRC)/sorts.$(ARCH).o           \
-$(SRC)/bisection.$(ARCH).o               \
+$(SRC)/bisection.$(ARCH).o       \
 $(SRC)/string.$(ARCH).o          \
 $(SRC)/findexec.$(ARCH).o        \