Index: /branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate.c
===================================================================
--- /branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate.c	(revision 37099)
+++ /branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate.c	(revision 37100)
@@ -13,7 +13,5 @@
   int NsecfiltInput, NsecfiltOutput;
 
-  double dtime;
-  struct timeval start, stop;
-  gettimeofday (&start, NULL);
+  INITTIME;
 
   CONTINUE = FALSE;
@@ -121,13 +119,10 @@
   }
 
-  gettimeofday (&stop, NULL);
-  dtime = DTIME (stop, start);
-
   if (!status) {
-    fprintf (stderr, "ERROR: elapsed time %9.4f sec\n", dtime);
+    MARKTIME ("ERROR: elapsed time %9.4f sec\n", dtime);
     exit (3);
   }
 
-  fprintf (stderr, "SUCCESS: elapsed time %9.4f sec\n", dtime);
+  MARKTIME ("SUCCESS: elapsed time %9.4f sec\n", dtime);
   exit (0);
 }
Index: /branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c
===================================================================
--- /branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c	(revision 37099)
+++ /branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c	(revision 37100)
@@ -163,4 +163,9 @@
       LoadCatalog (&outcatalog, outlist[0].regions[j], outcatalog.filename, "w", NsecfiltOutput);
 
+      // if no catalog already exists, use the input catalog to define the format
+      if (outcatalog.Naves_disk == 0) {
+	outcatalog.catformat = incatalog.catformat;
+      }
+
       merge_catalogs_old (outlist[0].regions[j], &outcatalog, &incatalog, RADIUS, secfiltMap);
 
Index: /branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c
===================================================================
--- /branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c	(revision 37099)
+++ /branches/eam_branches/ipp-20140717/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c	(revision 37100)
@@ -113,7 +113,5 @@
   int NsecfiltInput, NsecfiltOutput;
 
-  double dtime;
-  struct timeval start, stop;
-  gettimeofday (&start, NULL);
+  INITTIME;
 
   CONTINUE = FALSE;
@@ -132,4 +130,5 @@
 
   fprintf (stderr, "WARNING / ERROR : multi-threaded dvomerge does not handle merge tracking yet\n");
+  fprintf (stderr, "WARNING / ERROR : multi-threaded dvomerge does work in a parallel context\n");
   exit (2);
 
@@ -291,8 +290,5 @@
   }
 
-  gettimeofday (&stop, NULL);
-  dtime = DTIME (stop, start);
-  fprintf (stderr, "SUCCESS: elapsed time %9.4f sec\n", dtime);
-
+  MARKTIME ("SUCCESS: elapsed time %9.4f sec\n", dtime);
   exit (0);
 
@@ -316,4 +312,5 @@
     }
   }
+  MARKTIME ("ERROR: elapsed time %9.4f sec\n", dtime);
   exit (1);
 }