Changeset 5133

Timestamp:

Sep 25, 2005, 10:28:50 PM (21 years ago)

Author:

eugene

Message:

slightly sleazy change to set CATDIR for 2MASS

Location:

trunk/Ohana/src

Files:

• gastro2/src/greference2.c (modified) (2 diffs)
• mosastro/src/greference.c (modified) (2 diffs)

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

@@ -10 +10 @@
 
   Ref[0].N = 0;
-  /* get stars from the USNO catalog for the given region */
+  /* get stars from the USNO A catalog for the given region */
   if (!strcmp (REFCAT, "USNO")) {
     getusno (&catstats, Ref);
@@ -21 +21 @@
   }
   
-  /* get stars from the HST GSC catalog for the given region */
+  /* get stars from 2MASS for the given region -- add PHOTCODE check? */
   if (!strcmp (REFCAT, "2MASS")) {
-    get2mass (&catstats, Ref);
+    strcpy (CATDIR, TWO_MASS_DIR);
+    getptolemy (&catstats, Ref);
+    /* get2mass (&catstats, Ref); */
   }
   
-  /* get stars from the HST GSC catalog for the given region */
+  /* get stars from the DVO CATDIR for the given region */
   if (!strcmp (REFCAT, "PTOLEMY")) {
     getptolemy (&catstats, Ref);

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

@@ -23 +23 @@
   }
 
-  /* get stars from the USNO catalog for the given region */
+  /* get stars from the USNO A catalog for the given region */
   if (!strcmp (REFCAT, "USNO")) {
     stars = getusno (&catstats, &Nstars);
@@ -33 +33 @@
   }
   
-  /* get stars from the HST GSC catalog for the given region */
+  /* get stars from 2MASS for the given region -- add PHOTCODE check? */
   if (!strcmp (REFCAT, "2MASS")) {
-    stars = get2mass (&catstats, &Nstars);
+    strcpy (CATDIR, TWO_MASS_DIR);
+    stars = getptolemy (&catstats, &Nstars);
+    /* stars = get2mass (&catstats, &Nstars); */
   }
   
-  /* get stars from the HST GSC catalog for the given region */
+  /* get stars from the DVO CATDIR for the given region */
   if (!strcmp (REFCAT, "PTOLEMY")) {
     stars = getptolemy (&catstats, &Nstars);