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

Timestamp:

Oct 27, 2015, 4:49:06 PM (11 years ago)

Author:

eugene

Message:

extensive work on relphot, relastro, uniphot, dvomerge aiming to the construction and calibration of PV3

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/src/greference.c (modified) (4 diffs)

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

@@ -3 +3 @@
 # define LOAD_DR2    1
 
-Stars *greference (char *Refcat, SkyRegion *region, int photcode, unsigned int *nstars) {
+Catalog *greference (char *Refcat, SkyRegion *region, int photcode) {
 
-  unsigned int Nstars;
-  Stars *stars;
+  Catalog *catalog = NULL;
 
   if (VERBOSE) fprintf (stderr, "loading reference catalog data from %s\n", Refcat); 
   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;
-  stars = NULL;
-
+  /* get stars from HST GSC for the given region */
+  if (!strcasecmp (Refcat, "GSC")) {
+    catalog = getgsc (region);
+  }
+  
   /* get stars from USNO for the given region */
   if (!strcasecmp (Refcat, "USNO")) {
-    stars = getusno (region, photcode, &Nstars);
+    catalog = getusno (region);
   }
 
   /* get stars from the USNO B catalog for the given region */
   if (!strcasecmp (Refcat, "USNOB")) {
-    stars = getusnob (region, photcode, &Nstars);
+    catalog = getusnob (region);
   }
 
   /* get stars from the Tycho catalog for the given region */
   if (!strcasecmp (Refcat, "TYCHO")) {
-    // stars = gettycho2 (region, photcode, &Nstars);
     fprintf (stderr, "Tycho load via addstar is deprecated: use loadtycho\n");
     exit (2);
@@ -33 +33 @@
   /* get stars from the Tycho catalog for the given region (old ingest) */
   if (!strcasecmp (Refcat, "TYCHO_OLD")) {
-    // stars = gettycho (region, photcode, &Nstars);
     fprintf (stderr, "Tycho load via addstar is deprecated: use loadtycho\n");
     exit (2);
   }
 
-  /* get stars from HST GSC for the given region */
-  if (!strcasecmp (Refcat, "GSC")) {
-    stars = getgsc (region, &Nstars);
-  }
-  
   /* get stars from 2MASS for the given region */
   if (!strcasecmp (Refcat, "2MASS")) {
-    // stars = get2mass (region, photcode, LOAD_ALLSKY, &Nstars);
     fprintf (stderr, "2MASS load via addstar is deprecated: use load2mass\n");
     exit (2);
@@ -52 +45 @@
   /* get stars from 2MASS for the given region */
   if (!strcasecmp (Refcat, "2MASS-ALLSKY")) {
-    // stars = get2mass (region, photcode, LOAD_ALLSKY, &Nstars);
     fprintf (stderr, "2MASS load via addstar is deprecated: use load2mass\n");
     exit (2);
@@ -59 +51 @@
   /* get stars from 2MASS for the given region */
   if (!strcasecmp (Refcat, "2MASS-DR2")) {
-    // stars = get2mass (region, photcode, LOAD_DR2, &Nstars);
     fprintf (stderr, "2MASS load via addstar is deprecated: use load2mass\n");
     exit (2);
   }
   
-  if (VERBOSE && (Nstars == 0)) fprintf (stderr, "no ref objects in region %s\n", region[0].name);
+  if (VERBOSE && (catalog->Naverage == 0)) fprintf (stderr, "no ref objects in region %s\n", region[0].name);
 
-  *nstars = Nstars;
-  return (stars);
-
+  return (catalog);
 }