Changeset 25020 for branches/eam_branches/20090715/Ohana/src/addstar/src/load2mass.c

Timestamp:

Aug 7, 2009, 12:42:40 PM (17 years ago)

Author:

eugene

Message:

update from mainline

File:

• branches/eam_branches/20090715/Ohana/src/addstar/src/load2mass.c (modified) (3 diffs)

branches/eam_branches/20090715/Ohana/src/addstar/src/load2mass.c

@@ -7 +7 @@
   int i;
   SkyTable *sky, *sky2mass;
+  SkyList *skylist = NULL;
+  SkyList *overlap = NULL;
   AddstarClientOptions options;
 
@@ -13 +15 @@
   options = args_load2mass (argc, argv, options);
 
+  // load the full sky description table:
   sky = SkyTableLoadOptimal (CATDIR, SKY_TABLE, GSCFILE, SKY_DEPTH, VERBOSE);
   SkyTableSetFilenames (sky, CATDIR, "cpt");
   
+  // generate the subset matching the user-selected region
+  skylist = SkyListByPatch (sky, -1, &UserPatch);
+
+  // if we only match to existing (already populated) regions, limit the select to those regions:
+  if (options.existing_regions) {
+    SkyList *tmp;
+    tmp = SkyListExistingSubset (skylist, CATDIR);
+    SkyListFree (skylist);
+    skylist = tmp;
+  }
+
   path = TWO_MASS_DIR_AS;
 
@@ -23 +37 @@
   
   for (i = 0; i < sky2mass[0].Nregions; i++) {
+    // check if any of the skylist entries overlap this 2mass catalog:
+    overlap = SkyListByBounds_List (skylist, -1, sky2mass[0].regions[i].Rmin, sky2mass[0].regions[i].Rmax, sky2mass[0].regions[i].Dmin, sky2mass[0].regions[i].Dmax);
+    if (overlap[0].Nregions == 0) {
+      SkyListFree (overlap);
+      continue;
+    }
+    
     fprintf (stderr, "loading %s\n", sky2mass[0].filename[i]);
-    load2mass_as_rawdata (sky, sky2mass[0].filename[i], options);
+    load2mass_as_rawdata (overlap, sky2mass[0].filename[i], options);
+    SkyListFree (overlap);
   }
   exit (0);