Index: /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvoconvert.c
===================================================================
--- /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvoconvert.c	(revision 33212)
+++ /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvoconvert.c	(revision 33213)
@@ -100,7 +100,7 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);
Index: /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeContinue.c
===================================================================
--- /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeContinue.c	(revision 33212)
+++ /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeContinue.c	(revision 33213)
@@ -150,7 +150,7 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);
Index: /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeContinue_threaded.c
===================================================================
--- /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeContinue_threaded.c	(revision 33212)
+++ /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeContinue_threaded.c	(revision 33213)
@@ -277,7 +277,7 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename  (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);
Index: /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeCreate.c
===================================================================
--- /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeCreate.c	(revision 33212)
+++ /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeCreate.c	(revision 33213)
@@ -183,7 +183,7 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);
Index: /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate.c
===================================================================
--- /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate.c	(revision 33212)
+++ /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate.c	(revision 33213)
@@ -158,7 +158,7 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);
Index: /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c
===================================================================
--- /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c	(revision 33212)
+++ /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c	(revision 33213)
@@ -277,7 +277,7 @@
 
   // save the output sky table copy
-  sprintf (filename, "%s/SkyTable.fits", output);
-  check_file_access (filename, TRUE, TRUE, VERBOSE);
-  if (!SkyTableSave (outsky, filename)) {
+  char *skyfile = SkyTableFilename (output);
+  check_file_access (skyfile, TRUE, TRUE, VERBOSE);
+  if (!SkyTableSave (outsky, skyfile)) {
     fprintf (stderr, "ERROR: failed to save sky table for %s\n", output);
     exit (1);
Index: /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvoverify.c
===================================================================
--- /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvoverify.c	(revision 33212)
+++ /branches/eam_branches/ipp-20111122/Ohana/src/dvomerge/src/dvoverify.c	(revision 33213)
@@ -84,6 +84,6 @@
 
     // check the skytable
-    sprintf (filename, "%s/SkyTable.fits", catdir);
-    if (!VerifyTableFile (filename)) {
+    char *skyfile = SkyTableFilename (catdir);
+    if (!VerifyTableFile (skyfile)) {
       Nbad ++;
     }