Changeset 28993 for branches/eam_branches/ipp-20100621/Ohana/src/dvomerge/include/dvomerge.h

Timestamp:

Aug 20, 2010, 11:15:36 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/Ohana/src/dvomerge/include/dvomerge.h (modified) (2 diffs)

branches/eam_branches/ipp-20100621/Ohana/src/dvomerge/include/dvomerge.h

@@ -25 +25 @@
 float  RADIUS;
 int    SKY_DEPTH;
+char   *ALTERNATE_PHOTCODE_FILE;
 
 SkyRegion UserPatch;  // used by MODE CAT
@@ -66 +67 @@
 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));