Changeset 39743

Timestamp:

Oct 10, 2016, 8:35:31 PM (10 years ago)

Author:

eugene

Message:

add galaxy model option

Location:

branches/czw_branch/20160809/Ohana/src/fakeastro

Files:

• include/fakeastro.h (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/initialize.c (modified) (2 diffs)
• src/make_fake_stars_catalog.c (modified) (1 diff)
• src/make_gaia_measures.c (modified) (1 diff)

branches/czw_branch/20160809/Ohana/src/fakeastro/include/fakeastro.h

@@ -90 +90 @@
 
 float  TEST_SCALE;
+char  *GALAXY_MODEL;
 
 int    FORCE;

branches/czw_branch/20160809/Ohana/src/fakeastro/src/args.c

@@ -30 +30 @@
     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 +271 @@
   // }
 
+  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"))) {

branches/czw_branch/20160809/Ohana/src/fakeastro/src/initialize.c

@@ -17 +17 @@
 
   // 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 +30 @@
 
   // 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);
   }

branches/czw_branch/20160809/Ohana/src/fakeastro/src/make_fake_stars_catalog.c

@@ -116 +116 @@
     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;

branches/czw_branch/20160809/Ohana/src/fakeastro/src/make_gaia_measures.c

@@ -81 +81 @@
     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;