Changeset 29789

Timestamp:

Nov 17, 2010, 10:34:05 AM (15 years ago)

Author:

eugene

Message:

added dvomergeFromList option

Location:

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge

Files:

• Makefile (modified) (1 diff)
• include/dvomerge.h (modified) (1 diff)
• src/dvomerge.c (modified) (1 diff)
• src/dvomergeContinue.c (modified) (1 diff)
• src/dvomergeFromList.c (added)
• src/dvorepairFixCPT.c (modified) (1 diff)
• src/help.c (modified) (2 diffs)
• src/merge_catalogs_old.c (modified) (2 diffs)

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/Makefile

@@ -27 +27 @@
 $(SRC)/dvomergeCreate.$(ARCH).o \
 $(SRC)/dvomergeContinue.$(ARCH).o \
+$(SRC)/dvomergeFromList.$(ARCH).o \
 $(SRC)/dvo_image_merge_dbs.$(ARCH).o \
 $(SRC)/SetSignals.$(ARCH).o \

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/include/dvomerge.h

@@ -111 +111 @@
 int        dvomergeImagesGetMap   PROTO((IDmapType *IDmap, char *input, char *output));
 int        dvomergeContinue       PROTO((int argc, char **argv));
+int        dvomergeFromList       PROTO((int argc, char **argv));

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/dvomerge.c

@@ -10 +10 @@
   // XXX require both inputs to be sorted?
 
-  if (argc == 6) dvomergeCreate (argc, argv);
+  if (argc == 6) {
+    if (!strcasecmp (argv[2], "and")) {
+      dvomergeCreate (argc, argv);
+    } else {
+      dvomergeFromList (argc, argv);
+    }
+  }
   if (argc == 4) dvomergeUpdate (argc, argv);
   if (argc == 5) dvomergeContinue (argc, argv);

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/dvomergeContinue.c

@@ -15 +15 @@
 
   if (strcasecmp (argv[2], "into")) dvomerge_usage();
+  if (strcasecmp (argv[4], "continue")) dvomerge_usage();
 
   input  = argv[1];

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/dvorepairFixCPT.c

@@ -62 +62 @@
   }
   Nfiles = i;
+  fclose(file);
   
   for (i = 0; i < Nfiles; i++) {

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/help.c

@@ -5 +5 @@
   fprintf (stderr, "   OR: dvomerge (input) into (output)\n");
   fprintf (stderr, "   OR: dvomerge (input) into (output) continue\n");
+  fprintf (stderr, "   OR: dvomerge (input) into (output) from (list)\n");
   fprintf (stderr, "   [-region Rmin Rmax Dmin Dmax]\n");
   exit (2);
@@ -36 +37 @@
   fprintf (stderr, "  dvomerge (input) into (output)\n");
   fprintf (stderr, "  dvomerge (input) into (output) continue\n\n");
+  fprintf (stderr, "  dvomerge (input) into (output) from (list)\n\n");
   fprintf (stderr, "  merge DVO databases\n");
   fprintf (stderr, "  optional flags:\n");

branches/eam_branches/ipp-20101103/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -28 +28 @@
   unsigned int objID, catID;
   Coords tcoords;
-
+  
   // struct timeval start, stop;
   // gettimeofday (&start, (void *) NULL);
@@ -254 +254 @@
     i++;
   }
-  // MARKTIME("find matched stars: %f sec for "OFF_T_FMT","OFF_T_FMT" stars\n", dtime, Nstars, Nave);
+  // MARKTIME("find matched stars: %f sec for "OFF_T_FMT","OFF_T_FMT" stars ("OFF_T_FMT" meas)\n", dtime, Nstars, Nave, Nmeas);
 
   /** incorporate unmatched image stars, if this star is in field of this catalog **/