Changeset 38525 for branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadStars.c

Timestamp:

Jun 24, 2015, 6:38:37 AM (11 years ago)

Author:

eugene

Message:

converting from Stars to Catalog

File:

• branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadStars.c (modified) (5 diffs)

branches/eam_branches/ipp-20150616/Ohana/src/addstar/src/LoadStars.c

@@ -1 +1 @@
 # include "addstar.h"
 
-Catalog *LoadStars (char *filename, unsigned int *Ncatalog, Image **images, off_t *Nimages, AddstarClientOptions *options) {
+Catalog *LoadStars (char *filename, Image **images, off_t *Nimages, AddstarClientOptions *options) {
 
   off_t *extsize;
@@ -9 +9 @@
 
   *Nimages = 0;
-  *Ncatalog = 0;
   *images = NULL;
+
   Catalog *catalog = NULL;
+  // ALLOCATE (catalog, Catalog, 1);
+  // dvo_catalog_init (catalog, TRUE);
 
   for (i = 0; i < Nfile; i++) {
@@ -22 +24 @@
     // load PMM data if specified (these are not stored as FITS-tables)
     if (PMM_CCD_TABLE != NULL) {
-      *Ncatalog = 1;
       // XXX catalog = LoadDataPMM (f, file[i].imagename, images, Nimages);
       continue;
@@ -58 +59 @@
     // if these are SDSS data, load with SDSS-specific wrapper
     if (headerSets[0].exttype && !strcmp (headerSets[0].exttype, "SDSS_OBJ")) {
-      *Ncatalog = 1;
       // XXX catalog = LoadDataSDSS (f, file[i].imagename, images, Nimages, headers, extsize, headerSets, NheaderSets);
       goto next_file;
@@ -65 +65 @@
     // if these are SDSS data, load with SDSS-specific wrapper
     if (headerSets[0].exttype && !strcmp (headerSets[0].exttype, "UKIRT_OBJ")) {
-      *Ncatalog = 1;
       // XXX catalog = LoadDataUKIRT (f, file[i].imagename, images, Nimages, headers, extsize, headerSets, NheaderSets);
       goto next_file;
     }
 
-    catalog = LoadData (f, &file[i], images, Nimages, Ncatalog, headers, extsize, headerSets, NheaderSets, options);
+    Catalog *newcat = LoadData (f, &file[i], images, Nimages, headers, extsize, headerSets, NheaderSets, options);
+    catalog = newcat;
+
+    // XXX I need to use find_matches_closest here, but for testing:
+    // find_matches_closest (region, catalog, newcat, options);
+    // dvo_catalog_free (newcat);
+    // free (newcat);
 
   next_file: