Changeset 39748

Timestamp:

Oct 13, 2016, 12:51:32 PM (10 years ago)

Author:

eugene

Message:

fix solar motion model construction : distance was in pc, not kpc; bump up density of Gaia objects to something realistic

Location:

branches/czw_branch/20160809/Ohana/src/fakeastro/src

Files:

• args.c (modified) (1 diff)
• make_fake_stars_catalog.c (modified) (1 diff)
• make_fakestars.c (modified) (4 diffs)
• make_gaia_measures.c (modified) (2 diffs)

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

@@ -128 +128 @@
   }
 
-  MAX_MAG_GAIA = 16.0;
+  MAX_MAG_GAIA = 21.0;
   if ((N = get_argument (*argc, argv, "-gaia-limit"))) {
     remove_argument (N, argc, argv);

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

@@ -117 +117 @@
 
     // XXX TEST
-    dDsee = dRsee = 0.0;
+    // dDsee = dRsee = 0.0;
 
     double dRoff = (dRpm + dRsee) / 3600.0;

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

@@ -35 +35 @@
       // we can generate a distribution which is uniform on the sky, in which case
       // we can limit to the selected patch analyically
+
+      // note: r & z are generated in parsec
       r = pow(drand48(), 0.33333) * FAKEASTRO_RGAL;
       z = 0.0;
@@ -48 +50 @@
       int inPatch = FALSE;
       while (!inPatch) {
+        // note: r & z are generated in parsec
         z = ohana_gaussdev_rnd (0.0, FAKEASTRO_ZGAL);
         r = sqrt(drand48()) * FAKEASTRO_RGAL;
@@ -68 +71 @@
     // double y = r*sin(L);
 
+    // distance here is in parsec
     double distance = sqrt (SQ(r) + SQ(z));
 
@@ -74 +78 @@
 
     double uL_sol, uB_sol;
-    SolarMotionModel_radians(&uL_sol, &uB_sol, Lrad, Brad, distance);
+    SolarMotionModel_radians(&uL_sol, &uB_sol, Lrad, Brad, distance / 1000.0);
+    // note: SolarMotionModel wants distance in kpc
 
     double uL = uL_gal + uL_sol;

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

@@ -42 +42 @@
 
     // make a crude G-i color for now:
-    double G_PS1 = secfilt[i*Nsecfilt + Nsec].M + 1.0; // make all stars have G-i = 1.0
+    double G_PS1 = secfilt[i*Nsecfilt + Nsec].M; // make all stars have G-i = 1.0
     if (G_PS1 > MAX_MAG_GAIA) continue; // only generate GAIA detections for objects with G_PS1 < 21.0
 
@@ -78 +78 @@
 
     // uR,uD in linear arcsec
-    double dRsee = ohana_gaussdev_rnd (0.0, 1.0 / SN);
-    double dDsee = ohana_gaussdev_rnd (0.0, 1.0 / SN);
+    double dRsee = ohana_gaussdev_rnd (0.0, 0.01 / SN);
+    double dDsee = ohana_gaussdev_rnd (0.0, 0.01 / SN);
 
     // XXX TEST
-    dDsee = dRsee = 0.0;
+    // dDsee = dRsee = 0.0;
 
     double dRoff = (dRpm + dRsee) / 3600.0;