Changeset 39719 for branches/czw_branch/20160809/Ohana/src/delstar/include/delstar.h

Timestamp:

Sep 24, 2016, 3:29:05 PM (10 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/czw_branch/20160809

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/delstar/include/delstar.h (modified) (3 diffs)

branches/czw_branch/20160809/Ohana/src/delstar/include/delstar.h

@@ -93 +93 @@
 
 int   SAVE_DUPLICATES;
+int   SAVE_DELETES;
 int   SKIP_IMAGES;
 char *BACKUP_EXTNAME;
@@ -104 +105 @@
 
 int    MODE;
-enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES, MODE_DUP_IMAGES, MODE_DUP_MEASURES, MODE_FIX_LAP, MODE_FIX_LAP_STATS, MODE_FIX_LAP_EDGES, MODE_FIX_LAP_EDGES_DELETE};
+enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES, MODE_DUP_IMAGES, MODE_DUP_MEASURES, MODE_DELETE_MEASURES_BY_MATCH, MODE_FIX_LAP, MODE_FIX_LAP_STATS, MODE_FIX_LAP_EDGES, MODE_FIX_LAP_EDGES_DELETE};
 
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
@@ -185 +186 @@
 int ImageIDSave(char *filename, IndexArray *imageID);
 
+int delete_measures_by_match ();
+int delete_measures_by_match_parallel (SkyList *sky);
+DeleteMeasureResult delete_measures_by_match_catalog (Catalog *catalog);
+
 int delete_duplicate_measures ();
 int delete_duplicate_measures_parallel (SkyList *sky);