Changeset 35728

Timestamp:

Jul 1, 2013, 11:33:44 AM (13 years ago)

Author:

eugene

Message:

calling the wrong version of setMrelCatalog

Location:

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

Files:

• StarOps.c (modified) (1 diff)
• args.c (modified) (2 diffs)

branches/eam_branches/ipp-20130509/Ohana/src/relphot/src/StarOps.c

@@ -168 +168 @@
   for (i = 0; i < Ncatalog; i++) {
     switch (SET_MREL_VERSION) {
-      case 0:
-        setMrel_catalog (catalog, i, pass, flatcorr, &results, Nsecfilt);
-        break;
+      // case 0:
+      // setMrel_catalog (catalog, i, pass, flatcorr, &results, Nsecfilt);
+      // break;
       case 1:
         setMrel_catalog_alt (catalog, i, pass, flatcorr, &results, Nsecfilt);
         break;
       default:
-        fprintf (stderr, "invalid setMrel version %d (use 0 or 1)\n", SET_MREL_VERSION);
+        fprintf (stderr, "invalid setMrel version %d (use 1)\n", SET_MREL_VERSION);
         exit (2);
     }

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

@@ -177 +177 @@
   }
 
-  SET_MREL_VERSION = 1;
-  if ((N = get_argument (argc, argv, "-set-mrel-version"))) {
-    remove_argument (N, &argc, argv);
-    SET_MREL_VERSION = atof(argv[N]);
-    remove_argument (N, &argc, argv);
-  }
-
   UPDATE = FALSE;
   if ((N = get_argument (argc, argv, "-update"))) {
@@ -433 +426 @@
     remove_argument (N, &argc, argv);
     UserPatch.Dmax = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  SET_MREL_VERSION = 1;
+  if ((N = get_argument (argc, argv, "-set-mrel-version"))) {
+    remove_argument (N, &argc, argv);
+    SET_MREL_VERSION = atof(argv[N]);
     remove_argument (N, &argc, argv);
   }