Changeset 35229

Timestamp:

Mar 5, 2013, 8:20:29 AM (13 years ago)

Author:

eugene

Message:

adding new function to delete duplicate images

Location:

branches/eam_branches/ipp-20130207/Ohana/src/delstar

Files:

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

branches/eam_branches/ipp-20130207/Ohana/src/delstar/Makefile

@@ -29 +29 @@
 $(SRC)/delete_imagename.$(ARCH).o \
 $(SRC)/delete_imagefile.$(ARCH).o \
+$(SRC)/delete_duplicate_images.$(ARCH).o \
 $(SRC)/delete_image_photcodes.$(ARCH).o \
 $(SRC)/delete_photcodes.$(ARCH).o \
@@ -45 +46 @@
 $(SRC)/ConfigInit.$(ARCH).o       \
 $(SRC)/args.$(ARCH).o             \
+$(SRC)/delete_duplicate_images.$(ARCH).o \
 $(SRC)/delete_photcodes.$(ARCH).o \
 $(SRC)/delete_photcodes_single.$(ARCH).o \

branches/eam_branches/ipp-20130207/Ohana/src/delstar/include/delstar.h

@@ -2 +2 @@
 # include <dvo.h>
 # include <signal.h>
+
+// options for generating the IndexArray used to select images for deletion (delete_duplicate_images.c)
+enum {NONE, EXTERN_ID, IMAGE_ID};
 
 typedef struct {
@@ -10 +13 @@
   double Area, density, spacing;
 } CatStats;
+
+typedef struct {
+  off_t minID;
+  off_t maxID;
+  off_t range;
+  off_t *value;
+} IndexArray;
 
 /* global variables set in parameter file */
@@ -49 +59 @@
 
 int    MODE;
-enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES};
+enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES, MODE_DUP_IMAGES};
 
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
@@ -101 +111 @@
 int delete_image_photcodes (FITS_DB *db);
 int delete_photcodes_single (char *cptname);
+
+int delete_duplicate_images (int hostID, char *hostpath, FITS_DB *db);
+int delete_duplicate_image_measures (int hostID, char *hostpath, IndexArray *imageID);
+int delete_duplicate_image_measures_parallel (SkyList *sky);
+int delete_duplicate_image_measures_catalog (Catalog *catalog, IndexArray *imageID);
+
+IndexArray *find_duplicates (Image *image, off_t Nimage);
+IndexArray *make_index_array (Image *image, off_t Nimage, int mode);
+

branches/eam_branches/ipp-20130207/Ohana/src/delstar/src/args.c

@@ -126 +126 @@
     if (MODE != MODE_NONE) usage();
     MODE = MODE_MISSED;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-dup-images"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_DUP_IMAGES;
     remove_argument (N, &argc, argv);
   }

branches/eam_branches/ipp-20130207/Ohana/src/delstar/src/delstar.c

@@ -20 +20 @@
 
   switch (MODE) {
+    case MODE_DUP_IMAGES:
+      delete_duplicate_images (0, NULL, &db);
+      break;
     case MODE_IMAGEFILE:
       delete_imagefile (&db);