Index: trunk/Ohana/src/dvomerge/include/dvomerge.h
===================================================================
--- trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 27583)
+++ trunk/Ohana/src/dvomerge/include/dvomerge.h	(revision 28855)
@@ -25,4 +25,5 @@
 float  RADIUS;
 int    SKY_DEPTH;
+char   *ALTERNATE_PHOTCODE_FILE;
 
 SkyRegion UserPatch;  // used by MODE CAT
@@ -61,6 +62,6 @@
 int        LoadCatalog            PROTO((Catalog *catalog, SkyRegion *region, char *filename, char *mode));
 
-int        merge_catalogs_new     PROTO((SkyRegion *region, Catalog *output, Catalog *input));
-int        merge_catalogs_old     PROTO((SkyRegion *region, Catalog *output, Catalog *input, double RADIUS));
+int        merge_catalogs_new     PROTO((SkyRegion *region, Catalog *output, Catalog *input, int *secflitMap));
+int        merge_catalogs_old     PROTO((SkyRegion *region, Catalog *output, Catalog *input, double RADIUS, int *secflitMap));
 
 off_t 	  *init_measure_links     PROTO((Average *average, off_t Naverage, Measure *measure, off_t Nmeasure));