Index: /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomerge.c
===================================================================
--- /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomerge.c	(revision 38285)
+++ /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomerge.c	(revision 38286)
@@ -7,5 +7,4 @@
   ConfigInit (&argc, argv);
   dvomerge_args (&argc, argv);
-  replace_tycho_init();
 
   if (argc == 6) {
Index: /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomergeUpdate.c
===================================================================
--- /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomergeUpdate.c	(revision 38285)
+++ /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomergeUpdate.c	(revision 38286)
@@ -43,4 +43,6 @@
   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
Index: /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomerge_client.c
===================================================================
--- /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomerge_client.c	(revision 38285)
+++ /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/dvomerge_client.c	(revision 38286)
@@ -6,5 +6,4 @@
   ConfigInit (&argc, argv);
   dvomerge_client_args (&argc, argv);
-  replace_tycho_init();
 
   SkyTable *outsky, *insky;
Index: /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/merge_catalogs_old.c
===================================================================
--- /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/merge_catalogs_old.c	(revision 38285)
+++ /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/merge_catalogs_old.c	(revision 38286)
@@ -202,4 +202,5 @@
       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++;
Index: /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/replace_tycho.c
===================================================================
--- /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/replace_tycho.c	(revision 38285)
+++ /branches/eam_branches/ipp-20150419/Ohana/src/dvomerge/src/replace_tycho.c	(revision 38286)
@@ -10,5 +10,5 @@
 }
 
-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,6 +29,6 @@
   }
 
-  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);
   }
 
Index: /branches/eam_branches/ipp-20150419/Ohana/src/libohana/Makefile
===================================================================
--- /branches/eam_branches/ipp-20150419/Ohana/src/libohana/Makefile	(revision 38285)
+++ /branches/eam_branches/ipp-20150419/Ohana/src/libohana/Makefile	(revision 38286)
@@ -30,5 +30,5 @@
 $(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	 \