Changeset 40175 for branches/eam_branches/ohana.20170822

Timestamp:

Oct 19, 2017, 2:03:45 PM (9 years ago)

Author:

eugene

Message:

add function to delete detections by detID, imageID

Location:

branches/eam_branches/ohana.20170822/src/delstar

Files:

• Makefile (modified) (2 diffs)
• include/delstar.h (modified) (3 diffs)
• src/args.c (modified) (4 diffs)
• src/delete_measures_by_detID.c (added)
• src/delstar.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/delstar/Makefile

@@ -32 +32 @@
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
 $(SRC)/delete_measures_by_match.$(ARCH).o \
+$(SRC)/delete_measures_by_detID.$(ARCH).o \
 $(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_fix_LAP_edges.$(ARCH).o \
@@ -58 +59 @@
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
 $(SRC)/delete_measures_by_match.$(ARCH).o \
+$(SRC)/delete_measures_by_detID.$(ARCH).o \
 $(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_fix_LAP_edges.$(ARCH).o \

branches/eam_branches/ohana.20170822/src/delstar/include/delstar.h

@@ -96 +96 @@
 int   SKIP_IMAGES;
 char *BACKUP_EXTNAME;
+char *DELLIST_FILENAME;
 
 time_t    START;
@@ -105 +106 @@
 
 int    MODE;
-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};
+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_DELETE_MEASURES_BY_DETID, 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];
@@ -230 +231 @@
 int delete_fix_LAP_edges_drop_measures (Catalog *catalog, MeasureEdge *measure_edge, off_t Nmeasure_edge, int catIDcount);
 int delete_fix_LAP_edges_delete_parallel (SkyList *sky);
+
+typedef struct {
+  int  catID;
+  int *objID;
+  int *detID;
+  int *imageID;
+  int NdetID;
+} CatIDGroup;
+
+int dvo_catalog_subset_backup (Catalog *catalog, char *suffix);
+void isortthree (int *X, int *Y, int *Z, int N);
+int thisCatID (int *catID, int NcatID, int index);
+int needCatID (int *catID, int NcatID, int index);
+int delete_measures_by_detID_catalog (Catalog *catalog, CatIDGroup *catIDgroup);
+int delete_measures_by_detID_parallel (SkyList *sky);
+int delete_measures_by_detID ();
+

branches/eam_branches/ohana.20170822/src/delstar/src/args.c

@@ -202 +202 @@
   }
 
+  DELLIST_FILENAME = NULL;
+  if ((N = get_argument (argc, argv, "-delete-measures-by-detID"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_DELETE_MEASURES_BY_DETID;
+    remove_argument (N, &argc, argv);
+    SKIP_IMAGES = TRUE; // we do not need to load the images for -dup-measures
+    DELLIST_FILENAME = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   DELETE_MIN_DET_ID = 0;
   DELETE_MAX_DET_ID = 0;
@@ -374 +384 @@
   FREE (PHOTCODE_LIST);
   FREE (IMSTATS_FILE);
+  FREE (DELLIST_FILENAME);
 }
 
@@ -494 +505 @@
     remove_argument (N, &argc, argv);
     SKIP_IMAGES = TRUE; // we do not need to load the images for -dup-measures
+  }
+
+  DELLIST_FILENAME = NULL;
+  if ((N = get_argument (argc, argv, "-delete-measures-by-detID"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_DELETE_MEASURES_BY_DETID;
+    remove_argument (N, &argc, argv);
+    SKIP_IMAGES = TRUE; // we do not need to load the images for -dup-measures
+    DELLIST_FILENAME = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
   }
 
@@ -603 +624 @@
   FREE (MEASURE_EDGE_FILE);
   FREE (IMSTATS_FILE);
+  FREE (DELLIST_FILENAME);
 }
 

branches/eam_branches/ohana.20170822/src/delstar/src/delstar.c

@@ -34 +34 @@
     case MODE_DELETE_MEASURES_BY_MATCH:
       if (!delete_measures_by_match ()) exit (1);
+      delstar_args_free ();
+      ohana_memcheck (TRUE);
+      ohana_memdump (TRUE);
+      exit (0);
+      break;
+    case MODE_DELETE_MEASURES_BY_DETID:
+      if (!delete_measures_by_detID ()) exit (1);
       delstar_args_free ();
       ohana_memcheck (TRUE);