Index: /branches/czw_branch/20160809/Ohana/src/fakeastro/include/fakeastro.h
===================================================================
--- /branches/czw_branch/20160809/Ohana/src/fakeastro/include/fakeastro.h	(revision 39742)
+++ /branches/czw_branch/20160809/Ohana/src/fakeastro/include/fakeastro.h	(revision 39743)
@@ -90,4 +90,5 @@
 
 float  TEST_SCALE;
+char  *GALAXY_MODEL;
 
 int    FORCE;
Index: /branches/czw_branch/20160809/Ohana/src/fakeastro/src/args.c
===================================================================
--- /branches/czw_branch/20160809/Ohana/src/fakeastro/src/args.c	(revision 39742)
+++ /branches/czw_branch/20160809/Ohana/src/fakeastro/src/args.c	(revision 39743)
@@ -30,4 +30,12 @@
     FAKEASTRO_OP = OP_GAIA;
   }
+
+  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 ("ROESER");
 
   TEST_SCALE = 1.0;
@@ -263,4 +271,12 @@
   // }
 
+  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");
+
   VERBOSE = VERBOSE2 = FALSE;
   if ((N = get_argument (*argc, argv, "-v"))) {
Index: /branches/czw_branch/20160809/Ohana/src/fakeastro/src/initialize.c
===================================================================
--- /branches/czw_branch/20160809/Ohana/src/fakeastro/src/initialize.c	(revision 39742)
+++ /branches/czw_branch/20160809/Ohana/src/fakeastro/src/initialize.c	(revision 39743)
@@ -17,6 +17,6 @@
 
   // XXX add to config?
-  if (!InitGalaxyModel ("ROESER")) {
-    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);
   }
@@ -30,6 +30,6 @@
 
   // XXX add to config?
-  if (!InitGalaxyModel ("ROESER")) {
-    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);
   }
Index: /branches/czw_branch/20160809/Ohana/src/fakeastro/src/make_fake_stars_catalog.c
===================================================================
--- /branches/czw_branch/20160809/Ohana/src/fakeastro/src/make_fake_stars_catalog.c	(revision 39742)
+++ /branches/czw_branch/20160809/Ohana/src/fakeastro/src/make_fake_stars_catalog.c	(revision 39743)
@@ -116,4 +116,7 @@
     double dDsee = ohana_gaussdev_rnd (0.0, 1.0 / SN);
 
+    // XXX TEST
+    dDsee = dRsee = 0.0;
+
     double dRoff = (dRpm + dRsee) / 3600.0;
     double dDoff = (dDpm + dDsee) / 3600.0;
Index: /branches/czw_branch/20160809/Ohana/src/fakeastro/src/make_gaia_measures.c
===================================================================
--- /branches/czw_branch/20160809/Ohana/src/fakeastro/src/make_gaia_measures.c	(revision 39742)
+++ /branches/czw_branch/20160809/Ohana/src/fakeastro/src/make_gaia_measures.c	(revision 39743)
@@ -81,4 +81,7 @@
     double dDsee = ohana_gaussdev_rnd (0.0, 1.0 / SN);
 
+    // XXX TEST
+    dDsee = dRsee = 0.0;
+
     double dRoff = (dRpm + dRsee) / 3600.0;
     double dDoff = (dDpm + dDsee) / 3600.0;