Changeset 41562 for trunk/Ohana/src/relphot/src/args.c

Timestamp:

Apr 29, 2021, 2:17:05 PM (5 years ago)

Author:

eugene

Message:

allow tgroups to be fitted without supplying a tgroup list

File:

• trunk/Ohana/src/relphot/src/args.c (modified) (2 diffs)

trunk/Ohana/src/relphot/src/args.c

@@ -359 +359 @@
     TGROUP_ZEROPT = TRUE;
     remove_argument (N, &argc, argv);
-    TGROUP_FILENAME = strcreate(argv[N]);
-    remove_argument (N, &argc, argv);
     // if we fit for TGROUPS, start with the images and mosaics frozen
     TGROUP_ZPT_MODE = TGROUP_ZPT_MODE_ALL;
     IMAGE_ZPT_MODE  = IMAGE_ZPT_MODE_NONE;
     MOSAIC_ZPT_MODE = MOSAIC_ZPT_MODE_NONE;
+  }
+  if ((N = get_argument (argc, argv, "-tgroup-list"))) {
+    if (!TGROUP_ZEROPT) {
+      fprintf (stderr, "-tgroup-list (filename) requires -tgroup option\n");
+      exit (2);
+    }
+    remove_argument (N, &argc, argv);
+    TGROUP_FILENAME = strcreate(argv[N]);
+    remove_argument (N, &argc, argv);
   }
   if ((N = get_argument (argc, argv, "-tgroup")) || (N = get_argument (argc, argv, "-tgroups"))) {
@@ -567 +574 @@
   if (argc != 1) relphot_usage ();
 
-  if (TGROUP_ZEROPT) {
+  // if we supplied a file, we need to load it now
+  if (TGROUP_FILENAME) {
     loadTGroups (TGROUP_FILENAME);
     free (TGROUP_FILENAME);