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

Timestamp:

Jan 1, 2016, 3:04:44 PM (11 years ago)

Author:

eugene

Message:

adding option to match by extern id

File:

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

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

@@ -46 +46 @@
 char  *UPDATE_CATCOMPRESS;
 
+int    MATCH_BY_EXTERN_ID;
+
 int    MATCHED_TABLES;
 int    REPAIR_BY_OBJID;
@@ -202 +204 @@
 off_t      getTgtIndex            PROTO((e_time start, e_time stop, short photcode, off_t *TgtIndex, e_time *TgtTimes, short *TgtCodes, off_t NimagesTgt));
 void       SortTgtByTimes         PROTO((e_time *S, off_t *I, short *C, off_t N));
-int        dvo_image_match_dbs    PROTO((IDmapType *IDmap, FITS_DB *tgt, FITS_DB *src));
 int        dvomergeImagesGetMap   PROTO((IDmapType *IDmap, char *input, char *output));
 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        dvo_image_match_dbs_by_time_and_photcode PROTO((IDmapType *IDmap, FITS_DB *tgt, FITS_DB *src));
+int        dvo_image_match_dbs_by_extern_id         PROTO((IDmapType *IDmap, FITS_DB *tgt, FITS_DB *src));
 
 int        replace_match           PROTO((Average *average_out, Measure *measure_out, off_t *next_meas, Average *average_in, Measure *measure_in));