Changeset 33098 for branches/meh_branches/ppsub_test/Ohana/src/relastro/src/args.c

Timestamp:

Jan 11, 2012, 11:19:21 PM (15 years ago)

Author:

mhuber

Message:

merged latest r33093 trunk changes to meh_branches/ppsub_test

Location:

branches/meh_branches/ppsub_test

Files:

• . (modified) (1 prop)
• Ohana/src/relastro/src/args.c (modified) (4 diffs)

branches/meh_branches/ppsub_test/Ohana/src/relastro/src/args.c

@@ -1 +1 @@
 # include "relastro.h"
 void usage (void);
+void usage_merge_source (void);
+void usage_merge_source_id (char *name);
 
 int args (int argc, char **argv) {
@@ -6 +8 @@
   int N;
   double trange;
+  char *endptr;
 
   /* possible operations */
   FIT_TARGET = TARGET_NONE;
   FIT_MODE = FIT_AVERAGE;
+
+  OBJ_ID_SRC = OBJ_ID_DST = 0;
+  CAT_ID_SRC = CAT_ID_DST = 0;
+
+  if ((N = get_argument (argc, argv, "-merge-source"))) {
+    if (N > argc - 6) usage_merge_source();
+    if (strcmp(argv[N+3], "into")) usage_merge_source();
+    FIT_TARGET = TARGET_MERGE_SOURCE;
+    remove_argument (N, &argc, argv);
+    OBJ_ID_SRC = strtol(argv[N], &endptr, 0);
+    if (*endptr) usage_merge_source_id (argv[N]); 
+    remove_argument (N, &argc, argv);
+    CAT_ID_SRC = strtol(argv[N], &endptr, 0);
+    if (*endptr) usage_merge_source_id (argv[N]); 
+    remove_argument (N, &argc, argv);
+    remove_argument (N, &argc, argv); // remove the 'into'
+    OBJ_ID_DST = strtol(argv[N], &endptr, 0);
+    if (*endptr) usage_merge_source_id (argv[N]); 
+    remove_argument (N, &argc, argv);
+    CAT_ID_DST = strtol(argv[N], &endptr, 0);
+    if (*endptr) usage_merge_source_id (argv[N]); 
+    remove_argument (N, &argc, argv);
+
+    if (argc != 1) usage ();
+    return TRUE;
+  }
+
   if ((N = get_argument (argc, argv, "-update-objects"))) {
     remove_argument (N, &argc, argv);
     FIT_TARGET = TARGET_OBJECTS;
+  }
+
+  if ((N = get_argument (argc, argv, "-testobj1"))) {
+    if (N > argc - 3) usage ();
+    remove_argument (N, &argc, argv);
+    OBJ_ID_SRC = strtol(argv[N], &endptr, 0);
+    if (*endptr) usage ();
+    remove_argument (N, &argc, argv);
+    CAT_ID_SRC = strtol(argv[N], &endptr, 0);
+    if (*endptr) usage (); 
+    remove_argument (N, &argc, argv);
+  }
+
+  if ((N = get_argument (argc, argv, "-testobj2"))) {
+    if (N > argc - 3) usage ();
+    remove_argument (N, &argc, argv);
+    OBJ_ID_DST = strtol(argv[N], &endptr, 0);
+    if (*endptr) usage ();
+    remove_argument (N, &argc, argv);
+    CAT_ID_DST = strtol(argv[N], &endptr, 0);
+    if (*endptr) usage (); 
+    remove_argument (N, &argc, argv);
   }
 
@@ -307 +359 @@
   fprintf (stderr, "ERROR: USAGE: relastro -region RA RA DEC DEC\n");
   fprintf (stderr, "       OR:    relastro -catalog (ra) (dec)\n\n");
+  fprintf (stderr, "       OR:    relastro -high-speed [options]\n\n");
+  fprintf (stderr, "       OR:    relastro -merge-source [options]\n\n");
   fprintf (stderr, "  specify one of the following modes: \n");
   fprintf (stderr, "  -update-objects\n");
@@ -340 +394 @@
 } 
 
+void usage_merge_source_id (char *name) {
+
+  fprintf (stderr, "ERROR: invalid ID %s (remember to prefix 0x to hex IDs)\n", name);
+  exit (2);
+}
+
+void usage_merge_source () {
+  fprintf (stderr, "ERROR: USAGE: relastro -merge-source (objID) (catID) into (objID) (catID)\n");
+  exit (2);
+}