Changeset 39736

Timestamp:

Oct 8, 2016, 5:23:43 AM (10 years ago)

Author:

eugene

Message:

adding options to make gaia db

Location:

branches/czw_branch/20160809/Ohana/src/fakeastro

Files:

• Makefile (modified) (1 diff)
• include/fakeastro.h (modified) (3 diffs)
• src/ConfigInit.c (modified) (3 diffs)
• src/args.c (modified) (2 diffs)
• src/fakeastro.c (modified) (1 diff)
• src/fakeastro_gaia.c (added)
• src/make_gaia_measures.c (added)

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

@@ -53 +53 @@
 $(SRC)/match_fake_stars.$(ARCH).o \
 $(SRC)/fakeastro_2mass.$(ARCH).o \
+$(SRC)/fakeastro_gaia.$(ARCH).o \
 $(SRC)/make_2mass_measures.$(ARCH).o \
+$(SRC)/make_gaia_measures.$(ARCH).o \
 $(SRC)/remote_hosts.$(ARCH).o 
 

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

@@ -8 +8 @@
 # define RESETTIME { gettimeofday (&startTimer, (void *) NULL); }
 
-typedef enum {OP_NONE, OP_GALAXY, OP_IMAGES, OP_2MASS} FakeastroOp;
+typedef enum {OP_NONE, OP_GALAXY, OP_IMAGES, OP_2MASS, OP_GAIA} FakeastroOp;
 
 typedef struct {
@@ -101 +101 @@
 char   FAKEASTRO_REF_EPOCH[80];
 char   FAKEASTRO_2MASS_EPOCH[80];
+char   FAKEASTRO_GAIA_EPOCH[80];
 
 float  RADIUS;
 float  MAX_MAG_2MASS;
+float  MAX_MAG_GAIA;
 
 SkyRegion UserPatch;
@@ -198 +200 @@
 int fakeastro_2mass ();
 int make_2mass_measures (Catalog *catalog);
+
+int fakeastro_gaia ();
+int make_gaia_measures (Catalog *catalog);

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

@@ -19 +19 @@
   // if (!ScanConfig (config, "ADDSTAR_RADIUS",         "%lf", 0, &ADDSTAR_RADIUS))   ADDSTAR_RADIUS = 1.0;
 
-  if ((FAKEASTRO_OP == OP_GALAXY) || (FAKEASTRO_OP == OP_2MASS)) {
+  if ((FAKEASTRO_OP == OP_GALAXY) || (FAKEASTRO_OP == OP_2MASS) || (FAKEASTRO_OP == OP_GAIA)) {
     // force CATDIR to be absolute (so parallel mode will work)
     GetConfig (config, "CATDIR",                 "%s",  0, CATDIR);
@@ -60 +60 @@
     strcpy (FAKEASTRO_2MASS_EPOCH, "2000/01/01,00:00:00"); // epoch of 2MASS astrometry
   }
+  if (!ScanConfig (config, "FAKEASTRO_GAIA_EPOCH", "%s", 0, FAKEASTRO_GAIA_EPOCH)) {
+    strcpy (FAKEASTRO_GAIA_EPOCH, "2015/01/01,00:00:00"); // epoch of GAIA astrometry
+  }
 
   /* set the default search radius */
@@ -76 +79 @@
 
   // OP_2MASS is adding detections to an existing db, the others require and empty db
-  if (FAKEASTRO_OP != OP_2MASS) {
+  if ((FAKEASTRO_OP != OP_2MASS) && (FAKEASTRO_OP != OP_GAIA)) {
     // check for existence of CATDIR
     struct stat filestat;

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

@@ -24 +24 @@
     remove_argument (N, argc, argv);
     FAKEASTRO_OP = OP_2MASS;
+  }
+
+  if ((N = get_argument (*argc, argv, "-gaia"))) {
+    remove_argument (N, argc, argv);
+    FAKEASTRO_OP = OP_GAIA;
   }
 
@@ -114 +119 @@
   }
 
+  MAX_MAG_GAIA = 16.0;
+  if ((N = get_argument (*argc, argv, "-gaia-limit"))) {
+    remove_argument (N, argc, argv);
+    MAX_MAG_GAIA = atof(argv[N]);
+    remove_argument (N, argc, argv);
+  }
+
   FORCE = FALSE;
   if ((N = get_argument (*argc, argv, "-force"))) {

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

@@ -41 +41 @@
       exit (0);
 
+    case OP_GAIA:
+      fakeastro_gaia ();
+      /* make_gaia_measures()
+       */
+      exit (0);
+
     default:
       fprintf (stderr, "impossible!\n");