Changeset 39745 for branches/czw_branch/20160809/Ohana

Timestamp:

Oct 10, 2016, 8:36:23 PM (10 years ago)

Author:

eugene

Message:

add galaxy model option

Location:

branches/czw_branch/20160809/Ohana/src/uniphot

Files:

• include/setgalmodel.h (modified) (1 diff)
• src/initialize_setgalmodel.c (modified) (4 diffs)

branches/czw_branch/20160809/Ohana/src/uniphot/include/setgalmodel.h

@@ -18 +18 @@
 
 float        TEST_SCALE;
-
+char        *GALAXY_MODEL;
 SkyRegion    UserPatch;
 

branches/czw_branch/20160809/Ohana/src/uniphot/src/initialize_setgalmodel.c

@@ -45 +45 @@
 
   // XXX add to config?
-  if (!InitGalaxyModel ("FEAST-HIPPARCOS")) {
-    fprintf (stderr, "failed to init galaxy model\n");
+  if (!InitGalaxyModel (GALAXY_MODEL)) {
+    fprintf (stderr, "failed to init galaxy model %s\n", GALAXY_MODEL);
     exit (2);
   }
@@ -91 +91 @@
     remove_argument (N, &argc, argv);
   }
+
+  GALAXY_MODEL = NULL;
+  if ((N = get_argument (argc, argv, "-galaxy-model"))) {
+    remove_argument (N, &argc, argv);
+    GALAXY_MODEL = strcreate(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  if (!GALAXY_MODEL) GALAXY_MODEL = strcreate ("FEAST-HIPPARCOS");
 
   TEST_SCALE = 1.0;
@@ -172 +180 @@
   }
 
-  // XXX add to config?
-  if (!InitGalaxyModel ("ROESER")) {
+  // from args
+  if (!InitGalaxyModel (GALAXY_MODEL)) {
     fprintf (stderr, "failed to init galaxy model\n");
     exit (2);
@@ -212 +220 @@
     remove_argument (N, &argc, argv);
   }
+
+  GALAXY_MODEL = NULL;
+  if ((N = get_argument (argc, argv, "-galaxy-model"))) {
+    remove_argument (N, &argc, argv);
+    GALAXY_MODEL = strcreate(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  if (!GALAXY_MODEL) GALAXY_MODEL = strcreate ("FEAST-HIPPARCOS");
 
   TEST_SCALE = 1.0;