Changeset 27838 for branches/tap_branches/Ohana/src/dvomerge/src/args.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/dvomerge/src/args.c (modified) (1 diff)

branches/tap_branches/Ohana/src/dvomerge/src/args.c

@@ -1 +1 @@
 # include "dvomerge.h"
-static void help (void);
 
-int args (int argc, char **argv) {
+/*** check for command line options ***/
+int dvomerge_args (int *argc, char **argv) {
   
-  int i, N, CONFIRM;
-
-  /* check for help request */
-  if (get_argument (argc, argv, "-help") ||
-      get_argument (argc, argv, "-h")) {
-    help ();
-  }
-
-  /*** check for command line options ***/
-
-  /*** provide additional data ***/ 
-  /* restrict to a portion of the sky? (REFCAT only) */
-  UserPatch.Rmin = 0;
-  UserPatch.Rmax = 360;
-  UserPatch.Dmin = -90;
-  UserPatch.Dmax = +90;
-  CONFIRM = TRUE;
-  if ((N = get_argument (argc, argv, "-region"))) {
-    remove_argument (N, &argc, argv);
-    UserPatch.Rmin = atof (argv[N]);
-    remove_argument (N, &argc, argv);
-    UserPatch.Rmax = atof (argv[N]);
-    remove_argument (N, &argc, argv);
-    UserPatch.Dmin = atof (argv[N]);
-    remove_argument (N, &argc, argv);
-    UserPatch.Dmax = atof (argv[N]);
-    remove_argument (N, &argc, argv);
-    CONFIRM = FALSE;
-  }
+  int N;
 
   /* extra error messages */
   VERBOSE = FALSE;
-  if ((N = get_argument (argc, argv, "-v"))) {
+  if ((N = get_argument (*argc, argv, "-v"))) {
     VERBOSE = TRUE;
-    remove_argument (N, &argc, argv);
+    remove_argument (N, argc, argv);
   }
 
-  if (argc == 2) {
-    if (CONFIRM) {
-      fprintf (stderr, "you are splitting the entire sky in one pass\n");
-      fprintf (stderr, "this could be a time consuming operation.  type Ctrl-C within 5 seconds to cancel\n");
-      for (i = 5; i > 0; i--) {
-        fprintf (stderr, "%d.. ", i);
-        usleep (1000000);
-      }
-      fprintf (stderr, "\n");
-    }    
-    return (TRUE);
+  if ((*argc != 6) && (*argc != 4)) dvomerge_usage();
+  return TRUE;
+}
+
+/*** check for command line options ***/
+int dvoconvert_args (int *argc, char **argv) {
+  
+  int N;
+
+  /* extra error messages */
+  VERBOSE = FALSE;
+  if ((N = get_argument (*argc, argv, "-v"))) {
+    VERBOSE = TRUE;
+    remove_argument (N, argc, argv);
   }
 
-  fprintf (stderr, "USAGE: dvosplit (newlevel) [-region (Rmin) (Rmax) (Dmin) (Dmax)]\n");
-  exit (2);
+  if (*argc != 4) dvoconvert_usage();
+  return TRUE;
 }
-
-static void help () {
-
-  fprintf (stderr, "USAGE\n");
-  fprintf (stderr, "  dvosplit (newlevel)\n\n");
-  fprintf (stderr, "  optional flags:\n");
-  fprintf (stderr, "  -region ra ra dec dec       : migrate catalogs in specified region\n");
-  fprintf (stderr, "  -v                          : verbose mode\n");
-  fprintf (stderr, "  -help                       : this list\n");
-  fprintf (stderr, "  -h                          : this list\n\n");
-  exit (2);
-}
-
-/** addstar modes:
- 
-    addstar (image.smp)  - add cmp/smp image data to db
-    addstar -ref (file.dat) (photcode) 
-    addstar -cat (USNO/2MASS/GSC) -region (ra dec - ra dec)
-
-    -replace : ref/cat - replace existing match (photcode/time)
-    -match   : ref/cat - only add measures to existing averages
-
-    ref types: 
-    ASCII - RA,DEC,M,dM in a table
-
-    addstar 
-
-**/
-