Changeset 5443 for trunk/Ohana/src/addstar/src/greference.c

Timestamp:

Oct 24, 2005, 10:36:17 AM (21 years ago)

Author:

eugene

Message:

adding SkyRegion support to addstar (removing GSCRegion)

File:

• trunk/Ohana/src/addstar/src/greference.c (modified) (3 diffs)

trunk/Ohana/src/addstar/src/greference.c

@@ -3 +3 @@
 # define LOAD_DR2    1
 
-Stars *grefcat (char *Refcat, GSCRegion *catstats, int photcode, int *nstars) {
+Stars *grefcat (char *Refcat, SkyRegion *region, int photcode, int *nstars) {
 
   int Nstars;
@@ -9 +9 @@
 
   if (VERBOSE) fprintf (stderr, "loading reference catalog data from %s\n", Refcat); 
-  if (VERBOSE) fprintf (stderr, "full region: %f - %f, %f - %f\n", catstats[0].RA[0], catstats[0].RA[1], catstats[0].DEC[0], catstats[0].DEC[1]);
+  if (VERBOSE) fprintf (stderr, "full region: %f - %f, %f - %f\n", region[0].Rmin, region[0].Rmax, region[0].Dmin, region[0].Dmax);
 
   Nstars = 0;
@@ -16 +16 @@
   /* get stars from USNO for the given region */
   if (!strcasecmp (Refcat, "USNO")) {
-    stars = getusno (catstats, photcode, &Nstars);
+    stars = getusno (region, photcode, &Nstars);
   }
 
   /* get stars from HST GSC for the given region */
   if (!strcasecmp (Refcat, "GSC")) {
-    stars = getgsc (catstats, &Nstars);
+    stars = getgsc (region, &Nstars);
   }
   
   /* get stars from 2MASS for the given region */
   if (!strcasecmp (Refcat, "2MASS")) {
-    stars = get2mass (catstats, photcode, LOAD_ALLSKY, &Nstars);
+    stars = get2mass (region, photcode, LOAD_ALLSKY, &Nstars);
   }
   
   /* get stars from 2MASS for the given region */
   if (!strcasecmp (Refcat, "2MASS-ALLSKY")) {
-    stars = get2mass (catstats, photcode, LOAD_ALLSKY, &Nstars);
+    stars = get2mass (region, photcode, LOAD_ALLSKY, &Nstars);
   }
   
   /* get stars from 2MASS for the given region */
   if (!strcasecmp (Refcat, "2MASS-DR2")) {
-    stars = get2mass (catstats, photcode, LOAD_DR2, &Nstars);
+    stars = get2mass (region, photcode, LOAD_DR2, &Nstars);
   }
   
-  if (VERBOSE && (Nstars == 0)) fprintf (stderr, "no ref objects in region %s\n", catstats[0].filename);
+  if (VERBOSE && (Nstars == 0)) fprintf (stderr, "no ref objects in region %s\n", region[0].name);
 
   *nstars = Nstars;