Index: branches/czw_branch/20160809/Ohana/src/uniphot/include/setgalmodel.h
===================================================================
--- branches/czw_branch/20160809/Ohana/src/uniphot/include/setgalmodel.h	(revision 39744)
+++ branches/czw_branch/20160809/Ohana/src/uniphot/include/setgalmodel.h	(revision 39745)
@@ -18,5 +18,5 @@
 
 float        TEST_SCALE;
-
+char        *GALAXY_MODEL;
 SkyRegion    UserPatch;
 
Index: branches/czw_branch/20160809/Ohana/src/uniphot/src/initialize_setgalmodel.c
===================================================================
--- branches/czw_branch/20160809/Ohana/src/uniphot/src/initialize_setgalmodel.c	(revision 39744)
+++ branches/czw_branch/20160809/Ohana/src/uniphot/src/initialize_setgalmodel.c	(revision 39745)
@@ -45,6 +45,6 @@
 
   // 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,4 +91,12 @@
     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,6 +180,6 @@
   }
 
-  // XXX add to config?
-  if (!InitGalaxyModel ("ROESER")) {
+  // from args
+  if (!InitGalaxyModel (GALAXY_MODEL)) {
     fprintf (stderr, "failed to init galaxy model\n");
     exit (2);
@@ -212,4 +220,12 @@
     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;