Changeset 6242

Timestamp:

Jan 29, 2006, 9:26:13 AM (20 years ago)

Author:

eugene

Message:

add USNO B to references

Location:

trunk/Ohana/src

Files:

• gastro2/include/gastro2.h (modified) (1 diff)
• gastro2/src/ConfigInit.c (modified) (1 diff)
• gastro2/src/getusno.c (modified) (1 diff)
• gastro2/src/getusnob.c (added)
• gastro2/src/greference2.c (modified) (1 diff)
• mosastro/Makefile (modified) (1 diff)
• mosastro/include/mosastro.h (modified) (2 diffs)
• mosastro/src/ConfigInit.c (modified) (1 diff)
• mosastro/src/getusnob.c (added)
• mosastro/src/greference.c (modified) (1 diff)

trunk/Ohana/src/gastro2/include/gastro2.h

@@ -113 +113 @@
 int NPOLYTERMS;
 char CDROM[256];
+char USNO_B_DIR[256];
 char CATDIR[256];
 char   CATMODE[16];    /* raw, mef, split, mysql */

trunk/Ohana/src/gastro2/src/ConfigInit.c

@@ -41 +41 @@
   ScanConfig (config, "LONEOS_REGIONS",    "%s",  0, LONEOS_REGION_FILE);
   ScanConfig (config, "USNO_CDROM",        "%s",  0, CDROM);
+  ScanConfig (config, "USNO_B_DIR",        "%s",  0, USNO_B_DIR);
   ScanConfig (config, "ASTRO_REFCAT",      "%s",  0, REFCAT);
   ScanConfig (config, "CATDIR",            "%s",  0, CATDIR);

trunk/Ohana/src/gastro2/src/getusno.c

@@ -110 +110 @@
           stars[Nusno].R = buf[0]/360000.0;
           stars[Nusno].D = buf[1]/360000.0 - 90.0;
+          /* note that this is the RED mag */
           stars[Nusno].M = fabs (0.1*(buf[2] - 1000*((int)(buf[2]/1000))));
           /* b = 0.1*((int)(buf[2] - 1000000*((int)(buf[2]/1000000))) / 1000); */

trunk/Ohana/src/gastro2/src/greference2.c

@@ -13 +13 @@
   if (!strcmp (REFCAT, "USNO")) {
     getusno (&catstats, Ref);
+    /* calculate Ref[0].Moff from Target & Ref dMdN, Mo */
+  }
+
+  /* get stars from the USNO B catalog for the given region */
+  if (!strcmp (REFCAT, "USNOB")) {
+    getusnob (&catstats, Ref, EPOCH);
     /* calculate Ref[0].Moff from Target & Ref dMdN, Mo */
   }

trunk/Ohana/src/mosastro/Makefile

@@ -42 +42 @@
 $(SRC)/gcatalog.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
+$(SRC)/getusnob.$(ARCH).o \
 $(SRC)/wstars.$(ARCH).o \
 $(SRC)/field.$(ARCH).o \

trunk/Ohana/src/mosastro/include/mosastro.h

@@ -89 +89 @@
 char StoneRegions[256];
 char CDROM[256];
+char USNO_B_DIR[256];
 char REFCAT[256];
 char CATDIR[256];
@@ -162 +163 @@
 StarData  *getstone           PROTO((CatStats *input, int *nstars));
 StarData  *getusno            PROTO((CatStats *catstats, int *Nstars));
+StarData  *getusnob           PROTO((CatStats *catstats, int *Nstars));
 StarData  *gptolemy           PROTO((char *filename, int *NSTARS));
 StarData  *greference         PROTO((int *Nrefcat));

trunk/Ohana/src/mosastro/src/ConfigInit.c

@@ -26 +26 @@
   ScanConfig (config, "GSCDIR",           "%s",  0, GSC_DIR);
   ScanConfig (config, "STONE_DIR",        "%s",  0, StoneRegions);
+  ScanConfig (config, "USNO_B_DIR",       "%s",  0, USNO_B_DIR);
 
   /* abstracted header keywords */

trunk/Ohana/src/mosastro/src/greference.c

@@ -28 +28 @@
   }
 
+  /* get stars from the USNO A catalog for the given region */
+  if (!strcmp (REFCAT, "USNOB")) {
+    stars = getusnob (&catstats, &Nstars);
+  }
+
   /* get stars from the HST GSC catalog for the given region */
   if (!strcmp (REFCAT, "GSC")) {