Index: trunk/Ohana/src/dvomerge/include/dvomerge.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 33656)
+++ trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 33657)
@@ -16,7 +16,4 @@
 # include <arpa/inet.h>
 # include <glob.h>
-
-# define myAbort(MSG) { fprintf (stderr, "%s\n", MSG); abort(); }
-# define myAssert(LOGIC,MSG) { if (!(LOGIC)) { fprintf (stderr, "%s\n", MSG); abort(); } }
 
 int    VERBOSE;
Index: trunk/Ohana/src/dvomerge/src/args.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/args.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/args.c	(revision 33657)
@@ -14,5 +14,5 @@
   if ((N = get_argument (*argc, argv, "-photcode-file"))) {
     remove_argument (N, argc, argv);
-    ALTERNATE_PHOTCODE_FILE = strdup(argv[N]);
+    ALTERNATE_PHOTCODE_FILE = strcreate(argv[N]);
     remove_argument (N, argc, argv);
   }
Index: trunk/Ohana/src/dvomerge/src/dvoconvert.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/dvoconvert.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/dvoconvert.c	(revision 33657)
@@ -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: trunk/Ohana/src/dvomerge/src/dvomergeContinue.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/dvomergeContinue.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/dvomergeContinue.c	(revision 33657)
@@ -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: trunk/Ohana/src/dvomerge/src/dvomergeContinue_threaded.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/dvomergeContinue_threaded.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/dvomergeContinue_threaded.c	(revision 33657)
@@ -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: trunk/Ohana/src/dvomerge/src/dvomergeCreate.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/dvomergeCreate.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/dvomergeCreate.c	(revision 33657)
@@ -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: trunk/Ohana/src/dvomerge/src/dvomergeUpdate.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/dvomergeUpdate.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/dvomergeUpdate.c	(revision 33657)
@@ -3,6 +3,6 @@
 int dvomergeUpdate (int argc, char **argv) {
 
-  int depth, CONTINUE;
-  off_t i, j, Ns, Ne;
+  int CONTINUE;
+  off_t i, j;
   SkyTable *outsky, *insky;
   SkyList *outlist, *inlist;
@@ -101,6 +101,7 @@
   // loop over the populatable output tables; check for data in input in the corresponding regions
 
-  SkyListPopulatedRange (&Ns, &Ne, inlist, 0);
-  depth = inlist[0].regions[Ns][0].depth;
+  // XXX this is not really used...
+  // SkyListPopulatedRange (&Ns, &Ne, inlist, 0);
+  // depth = inlist[0].regions[Ns][0].depth;
   
   SetPhotcodeTable(NULL);
@@ -126,5 +127,5 @@
     // compare to a slightly reduced footprint
     float dPos = 2.0/3600.0;
-    outlist = SkyListByBounds (outsky, depth, inlist[0].regions[i][0].Rmin + dPos, inlist[0].regions[i][0].Rmax - dPos, inlist[0].regions[i][0].Dmin + dPos, inlist[0].regions[i][0].Dmax - dPos);
+    outlist = SkyListByBounds (outsky, inlist[0].regions[i][0].depth, inlist[0].regions[i][0].Rmin + dPos, inlist[0].regions[i][0].Rmax - dPos, inlist[0].regions[i][0].Dmin + dPos, inlist[0].regions[i][0].Dmax - dPos);
     for (j = 0; j < outlist[0].Nregions; j++) {
       if (VERBOSE) fprintf (stderr, "output : %s\n", outlist[0].regions[j][0].name);
@@ -158,7 +159,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: trunk/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/dvomergeUpdate_threaded.c	(revision 33657)
@@ -61,4 +61,5 @@
     // compare to a slightly reduced footprint
     float dPos = 2.0/3600.0;
+    // XXX probably need to use threadData->region->depth
     outlist = SkyListByBounds (threadData->outsky, threadData->depth, threadData->region->Rmin + dPos, threadData->region->Rmax - dPos, threadData->region->Dmin + dPos, threadData->region->Dmax - dPos);
     for (j = 0; (j < outlist[0].Nregions) && (threadData->state != TS_FAIL); j++) {
@@ -277,7 +278,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: trunk/Ohana/src/dvomerge/src/dvorepairCPT.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/dvorepairCPT.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/dvorepairCPT.c	(revision 33657)
@@ -1,6 +1,3 @@
 # include "dvomerge.h"
-
-# define myAbort(MSG) { fprintf (stderr, "%s\n", MSG); abort(); }
-# define myAssert(LOGIC,MSG) { if (!(LOGIC)) { fprintf (stderr, "%s\n", MSG); abort(); } }
 
 // broken cpt file, valid cpm file: we can recover everything in the cpt file from the cpm file:
Index: trunk/Ohana/src/dvomerge/src/dvorepairImageVsMeasure.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/dvorepairImageVsMeasure.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/dvorepairImageVsMeasure.c	(revision 33657)
@@ -1,6 +1,3 @@
 # include "dvomerge.h"
-
-# define myAbort(MSG) { fprintf (stderr, "%s\n", MSG); abort(); }
-# define myAssert(LOGIC,MSG) { if (!(LOGIC)) { fprintf (stderr, "%s\n", MSG); abort(); } }
 
 // find images which are missing detections:
Index: trunk/Ohana/src/dvomerge/src/dvoverify.c
===================================================================
--- trunk/Ohana/src/dvomerge/src/dvoverify.c	(revision 33656)
+++ trunk/Ohana/src/dvomerge/src/dvoverify.c	(revision 33657)
@@ -84,6 +84,6 @@
 
     // check the skytable
-    sprintf (filename, "%s/SkyTable.fits", catdir);
-    if (!VerifyTableFile (filename)) {
+    char *skyfile = SkyTableFilename (catdir);
+    if (!VerifyTableFile (skyfile)) {
       Nbad ++;
     }