Changeset 35730

Timestamp:

Jul 1, 2013, 2:36:33 PM (13 years ago)

Author:

eugene

Message:

initial pass on delstar -fix-LAP-edges

Location:

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

Files:

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

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

@@ -32 +32 @@
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
 $(SRC)/delete_fix_LAP.$(ARCH).o \
+$(SRC)/delete_fix_LAP_edges.$(ARCH).o \
 $(SRC)/delete_image_photcodes.$(ARCH).o \
 $(SRC)/delete_photcodes.$(ARCH).o \
@@ -43 +44 @@
 $(SRC)/ImageOpsFixLAP.$(ARCH).o       \
 $(SRC)/ImageSubsetFixLAP.$(ARCH).o       \
+$(SRC)/MeasureEdgeOps.$(ARCH).o       \
 $(SRC)/check_permissions.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o          
@@ -54 +56 @@
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
 $(SRC)/delete_fix_LAP.$(ARCH).o \
+$(SRC)/delete_fix_LAP_edges.$(ARCH).o \
 $(SRC)/delete_photcodes.$(ARCH).o \
 $(SRC)/delete_photcodes_single.$(ARCH).o \
@@ -59 +62 @@
 $(SRC)/ImageOpsFixLAP.$(ARCH).o       \
 $(SRC)/ImageSubsetFixLAP.$(ARCH).o       \
+$(SRC)/MeasureEdgeOps.$(ARCH).o       \
 $(SRC)/Shutdown.$(ARCH).o          
 

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

@@ -35 +35 @@
 } ImageSubset;
 
+typedef struct {
+  double R;
+  double D;
+  int objID;
+  int catID;
+  int detID;
+  int imageID;
+} MeasureEdge;
+
 /* global variables set in parameter file */
 char   ImageCat[DVO_MAX_PATH];
@@ -49 +58 @@
 char  *IMAGES;
 char  *IMSTATS_FILE;
+char  *MEASURE_EDGE_FILE;
 
 double NSIGMA;
@@ -80 +90 @@
 
 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};
+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};
 
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
@@ -172 +182 @@
 void BumpValidImage (int Seq);
 
+MeasureEdge *delete_fix_LAP_edges (off_t *nmeasure_edge);
+MeasureEdge *delete_fix_LAP_edges_parallel (SkyList *sky, off_t *nmeasure_edge);
+MeasureEdge *delete_fix_LAP_edges_get_measures (Catalog *catalog, MeasureEdge *measure_edge, off_t *Nmeasure_edge_in, off_t *NMEASURE_EDGE_IN);
+int          delete_fix_LAP_edges_find_dups (MeasureEdge *measure_edge, off_t Nmeasure_edge);
+
+MeasureEdge *MeasureEdgeMerge (MeasureEdge *measure_edge_all, off_t *Nmeasure_edge_in, off_t *NMEASURE_EDGE_IN, MeasureEdge *measure_edge, off_t Nmeasure_edge);
+int MeasureEdgeSave(char *filename, MeasureEdge *measure_edge, off_t Nmeasure_edge);
+MeasureEdge *MeasureEdgeLoad(char *filename, off_t *Nmeasure_edge);

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

@@ -193 +193 @@
     remove_argument (N, &argc, argv);
   }
+  if ((N = get_argument (argc, argv, "-fix-LAP-edges"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_FIX_LAP_EDGES;
+    remove_argument (N, &argc, argv);
+  }
   if ((N = get_argument (argc, argv, "-photcodes"))) {
     if (MODE != MODE_NONE) usage();
@@ -397 +402 @@
     if (!IMAGES) delstar_client_usage();
   }
+  if ((N = get_argument (argc, argv, "-fix-LAP-edges"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_FIX_LAP_EDGES;
+    remove_argument (N, &argc, argv);
+  }
+
+  MEASURE_EDGE_FILE = NULL;
+  if (MODE == MODE_FIX_LAP_EDGES) {
+    N = get_argument (argc, argv, "-measures");
+    if (N == 0) {
+      fprintf (stderr, "delstar_client -fix-LAP-edge needs -measures (FILE)\n");
+      exit (2);
+    }
+    remove_argument (N, &argc, argv);
+    MEASURE_EDGE_FILE = strcreate (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
 
   IMSTATS_FILE = NULL;

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

@@ -46 +46 @@
         break;
       }
+    case MODE_FIX_LAP_EDGES: {
+      off_t Nmeasure_edge = 0;
+      MeasureEdge *measure_edge = delete_fix_LAP_edges(&Nmeasure_edge);
+      if (!measure_edge) {
+        fprintf (stderr, "problem loading edge measures\n"); 
+        exit (1);
+      }
+      delete_fix_LAP_edges_find_dups (measure_edge, Nmeasure_edge);
+      exit (0);
+      break;
+    }
     case MODE_FIX_LAP_STATS: {
         off_t Nimage;

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

@@ -43 +43 @@
     }
 
+    case MODE_FIX_LAP_EDGES: {
+      off_t Nmeasure_edge = 0;
+      MeasureEdge *measure_edge = delete_fix_LAP_edges(&Nmeasure_edge);
+      if (!measure_edge) {
+        fprintf (stderr, "problem loading edge measures\n"); 
+        exit (1);
+      }
+      if (!MeasureEdgeSave (MEASURE_EDGE_FILE, measure_edge, Nmeasure_edge)) {
+        fprintf (stderr, "problem saving edge measures\n"); 
+        exit (1);
+      }
+      exit (0);
+      break;
+    }
+
     case MODE_IMAGEFILE:
       break;