Changeset 39301 for trunk/Ohana/src/dvomerge/include/dvomerge.h

Timestamp:

Jan 4, 2016, 1:12:14 PM (11 years ago)

Author:

eugene

Message:

changes to dvomerge to handle a cpt list restriction

File:

• trunk/Ohana/src/dvomerge/include/dvomerge.h (modified) (3 diffs)

trunk/Ohana/src/dvomerge/include/dvomerge.h

@@ -45 +45 @@
 char  *UPDATE_CATFORMAT;
 char  *UPDATE_CATCOMPRESS;
-char  *RESTRICT_CPT;
+
+char  *CPTLIST_FILENAME;
+char **CPTLIST;
+int   NCPTLIST;
 
 int    MATCH_BY_EXTERN_ID;
@@ -208 +211 @@
 int        dvomergeFromList       PROTO((int argc, char **argv));
 int        dvomergeUpdate_threaded PROTO((int argc, char **argv));
-int        dvomergeUpdate_catalogs PROTO((char *input, char *output, SkyTable *outsky, SkyList *inlist, int NsecfiltInput, int NsecfiltOutput, IDmapType *IDmap, int *secfiltMap));
+int        dvomergeUpdate_catalogs PROTO((char *input, char *output, SkyList *inlist, SkyTable *outsky, int NsecfiltInput, int NsecfiltOutput, IDmapType *IDmap, int *secfiltMap));
 
 int        dvo_image_match_dbs_by_time_and_photcode PROTO((IDmapType *IDmap, FITS_DB *tgt, FITS_DB *src));
@@ -262 +265 @@
 int dvorepairFixStackIDs (int argc, char **argv);
 
+char **load_cptlist (char *filename, int *nlist);