Changeset 29794 for branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/include/dvomerge.h

Timestamp:

Nov 18, 2010, 11:37:50 AM (16 years ago)

Author:

eugene

Message:

add threading to dvomergeContinue : requires changing LoadCatalog to avoid the global photcode table

File:

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

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

@@ -28 +28 @@
 float  RADIUS;
 int    SKY_DEPTH;
+int    NTHREADS;
 char   *ALTERNATE_PHOTCODE_FILE;
 
@@ -68 +69 @@
 SkyList   *SkyTablePopulatedList_old  PROTO((SkyTable *sky, off_t Ns, off_t Ne));
 
-int        LoadCatalog            PROTO((Catalog *catalog, SkyRegion *region, char *filename, char *mode));
+int        LoadCatalog            PROTO((Catalog *catalog, SkyRegion *region, char *filename, char *mode, int Nsecfilt));
 
 int        merge_catalogs_new     PROTO((SkyRegion *region, Catalog *output, Catalog *input, int *secflitMap));
@@ -112 +113 @@
 int        dvomergeContinue       PROTO((int argc, char **argv));
 int        dvomergeFromList       PROTO((int argc, char **argv));
+int        dvomergeContinue_threaded PROTO((int argc, char **argv));