Changeset 37478

Timestamp:

Oct 9, 2014, 5:55:15 PM (12 years ago)

Author:

eugene

Message:

updates

Location:

branches/eam_branches/ipp-20140904/Ohana/src/fakeastro

Files:

• include/fakeastro.h (modified) (2 diffs)
• src/ConfigInit.c (modified) (1 diff)
• src/fakeastro_galaxy.c (modified) (1 diff)
• src/fit_fake_stars.c (modified) (2 diffs)
• src/make_fake_images.c (modified) (1 diff)
• src/make_fake_stars_catalog.c (modified) (1 diff)
• src/make_fakeqsos.c (added)
• src/make_fakestars.c (modified) (2 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/include/fakeastro.h

@@ -30 +30 @@
   Average  average;
   Measure  measure;
-  Lensing *lensing; // optionally carry out the lensing measurements
   int found;
 } Stars;
@@ -87 +86 @@
 
 int    FORCE;
+
+int FAKEASTRO_NLOOP;
+int FAKEASTRO_NSTARS;
+float FAKEASTRO_ZGAL; // parsec
+float FAKEASTRO_RGAL; // parsec
+char FAKEASTRO_REF_EPOCH[80];
 
 float  RADIUS;

branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/ConfigInit.c

@@ -34 +34 @@
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) SKY_DEPTH = 2;
   if (!ScanConfig (config, "SKY_TABLE",         "%s",  0, SKY_TABLE)) SKY_TABLE[0] = 0;
+
+  
+  if (!ScanConfig (config, "FAKEASTRO_NLOOP", "%d", 0, &FAKEASTRO_NLOOP)) {
+    FAKEASTRO_NLOOP = 1;
+  }
+  if (!ScanConfig (config, "FAKEASTRO_NSTARS", "%d", 0, &FAKEASTRO_NSTARS)) {
+    FAKEASTRO_NSTARS = 5000000;
+  }
+  if (!ScanConfig (config, "FAKEASTRO_ZGAL", "%f", 0, &FAKEASTRO_ZGAL)) {
+    FAKEASTRO_ZGAL = 500.0; // parsec
+  }
+  if (!ScanConfig (config, "FAKEASTRO_RGAL", "%f", 0, &FAKEASTRO_RGAL)) {
+    FAKEASTRO_RGAL = 2000.0; // parsec
+  }
+  if (!ScanConfig (config, "FAKEASTRO_REF_EPOCH", "%s", 0, FAKEASTRO_REF_EPOCH)) {
+    strcpy (FAKEASTRO_REF_EPOCH, "2011/05/11,00:00:00"); // epoch of reference catalog
+  }
 
   /* set the default search radius */

branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/fakeastro_galaxy.c

@@ -29 +29 @@
   }
 
-  int Nloop = 1;
-  int Nstars = 5000000;
-
-  for (n = 0; n < Nloop; n++) {
+  for (n = 0; n < FAKEASTRO_NLOOP; n++) {
 
     INITTIME;
 
+    int Nstars = FAKEASTRO_NSTARS;
     FakeAstro_Stars *stars = make_fakestars (Nstars);
+
+    FakeAstro_Stars *qso_icrf = make_fakeqsos (Nstars);
 
     MARKTIME ("generate %d fake stars in %f sec\n", Nstars, dtime);

branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/fit_fake_stars.c

@@ -3 +3 @@
 int fit_fake_stars (Stars *stars, int Nstars, Image *image) {
 
-  // XXX I should set this based on Nstars
-  int order_use = 6;
+  // if we are doing imagemap or high-order polynomial fits, this is the order we should
+  // use
+  int order_use = 0;
+  if (Nstars >   5) order_use = 1; //  5 stars per cell
+  if (Nstars >  24) order_use = 2; //  6 stars per cell
+  if (Nstars >  63) order_use = 3; //  7 stars per cell
+  if (Nstars > 128) order_use = 4; //  8 stars per cell
+  if (Nstars > 225) order_use = 5; //  9 stars per cell
+  if (Nstars > 360) order_use = 6; // 10 stars per cell
 
   // I have Nstars with "reference" positions stars[].Rref,Dref and 
@@ -12 +19 @@
 
   int CHIPMAP = (image[0].coords.Npolyterms == -1);
-  if (CHIPMAP) image[0].coords.Npolyterms = -1;
+  image[0].coords.Npolyterms = CHIPMAP ? -1 : order_use;
 
   CoordFit *fit = fit_init (image[0].coords.Npolyterms);

branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/make_fake_images.c

@@ -59 +59 @@
       fakeImage[N].coords.Npolyterms = 1;
 
+      // XXX add higher order polynomials or imagemaps here
+
       fakeImage[N].coords.mosaic = &fakeImage[0].coords;
 

branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/make_fake_stars_catalog.c

@@ -20 +20 @@
   int Nstars = *nstars;
   
-  time_t timeRef = ohana_date_to_sec("2011/05/11,00:00:00");
+  time_t timeRef = ohana_date_to_sec(FAKEASTRO_REF_EPOCH);
   
   if (!stars) {

branches/eam_branches/ipp-20140904/Ohana/src/fakeastro/src/make_fakestars.c

@@ -1 +1 @@
 # include "fakeastro.h"
-
-// # define Z_GAL 500.0
-# define Z_GAL 2000.0
-# define R_GAL 2000.0
 
 static double iFkap = 0.001 / 4.74047; // (km/sec/kpc) / (arcsec/ year)
@@ -41 +37 @@
     int inPatch = FALSE;
     while (!inPatch) {
-      z = rnd_gauss (0.0, Z_GAL);
-      r = sqrt(drand48()) * R_GAL;
+      z = rnd_gauss (0.0, FAKEASTRO_ZGAL);
+      r = sqrt(drand48()) * FAKEASTRO_RGAL;
       Lrad = drand48() * 2 * M_PI;
       Brad = atan2(z,r);