Changeset 35740

Timestamp:

Jul 2, 2013, 8:38:28 PM (13 years ago)

Author:

eugene

Message:

adding the fix_LAP_edges_delete option

Location:

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

Files:

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

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

@@ -33 +33 @@
 $(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_fix_LAP_edges.$(ARCH).o \
+$(SRC)/delete_fix_LAP_edges_delete.$(ARCH).o \
 $(SRC)/delete_image_photcodes.$(ARCH).o \
 $(SRC)/delete_photcodes.$(ARCH).o \
@@ -57 +58 @@
 $(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_fix_LAP_edges.$(ARCH).o \
+$(SRC)/delete_fix_LAP_edges_delete.$(ARCH).o \
 $(SRC)/delete_photcodes.$(ARCH).o \
 $(SRC)/delete_photcodes_single.$(ARCH).o \

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

@@ -59 +59 @@
 char  *IMSTATS_FILE;
 char  *MEASURE_EDGE_FILE;
+char  *EDGE_DELETIONS;
 
 double NSIGMA;
@@ -90 +91 @@
 
 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};
+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};
 
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
@@ -190 +191 @@
 int MeasureEdgeSave(char *filename, MeasureEdge *measure_edge, off_t Nmeasure_edge);
 MeasureEdge *MeasureEdgeLoad(char *filename, off_t *Nmeasure_edge);
+
+int delete_fix_LAP_edges_delete ();
+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);

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

@@ -190 +190 @@
     MODE = MODE_FIX_LAP_STATS;
     remove_argument (N, &argc, argv);
+    if (N == argc) {
+      fprintf (stderr, "USAGE: delstar -fix-LAP-imstats (uniquer)\n");
+      exit (2);
+    }
     UNIQUER = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
@@ -196 +200 @@
     if (MODE != MODE_NONE) usage();
     MODE = MODE_FIX_LAP_EDGES;
+    remove_argument (N, &argc, argv);
+    SKIP_IMAGES = TRUE;
+  }
+  EDGE_DELETIONS = NULL;
+  if ((N = get_argument (argc, argv, "-fix-LAP-edges-delete"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_FIX_LAP_EDGES;
+    remove_argument (N, &argc, argv);
+    if (N == argc) {
+      fprintf (stderr, "USAGE: delstar -fix-LAP-edges-delete (deletions)\n");
+      exit (2);
+    }
+    EDGE_DELETIONS = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
     SKIP_IMAGES = TRUE;
@@ -408 +425 @@
     remove_argument (N, &argc, argv);
   }
+  EDGE_DELETIONS = NULL;
+  if ((N = get_argument (argc, argv, "-fix-LAP-edges-delete"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_FIX_LAP_EDGES;
+    remove_argument (N, &argc, argv);
+    if (N == argc) {
+      fprintf (stderr, "USAGE: delstar -fix-LAP-edges-delete (deletions)\n");
+      exit (2);
+    }
+    EDGE_DELETIONS = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+    SKIP_IMAGES = TRUE;
+  }
 
   MEASURE_EDGE_FILE = NULL;
@@ -417 +447 @@
     }
     remove_argument (N, &argc, argv);
+    if (N == argc) {
+      fprintf (stderr, "USAGE: delstar -fix-LAP-edges -measures (FILE) [FILE missing]\n");
+      exit (2);
+    }
     MEASURE_EDGE_FILE = strcreate (argv[N]);
     remove_argument (N, &argc, argv);

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

@@ -57 +57 @@
       break;
     }
+    case MODE_FIX_LAP_EDGES_DELETE: {
+      if (!delete_fix_LAP_edges_delete()) {
+        fprintf (stderr, "problem loading edge measures\n"); 
+        exit (1);
+      }
+      exit (0);
+      break;
+    }
     case MODE_FIX_LAP_STATS: {
         off_t Nimage;