Changeset 5945 for trunk/Ohana/src/addstar

Timestamp:

Jan 6, 2006, 6:45:40 PM (21 years ago)

Author:

eugene

Message:

moved filename out of SkyRegion into SkyList, SkyTable

Location:

trunk/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/SkyRegionUtils.c (modified) (1 diff)
• src/UpdateDatabase_Image.c (modified) (1 diff)
• src/UpdateDatabase_Refcat.c (modified) (1 diff)
• src/UpdateDatabase_Reflist.c (modified) (1 diff)
• src/addstar.c (modified) (2 diffs)
• src/get2mass.c (modified) (2 diffs)
• src/get2mass_as.c (modified) (1 diff)
• src/get2mass_dr2.c (modified) (1 diff)
• src/getgsc.c (modified) (1 diff)
• src/load_pt_catalog.c (modified) (1 diff)

trunk/Ohana/src/addstar/include/addstar.h

@@ -119 +119 @@
 void       help                   PROTO(());
 int        in_image               PROTO((double r, double d, Image *image));
-int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region, char *path));  /*** choose new name ***/
+int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region));  /*** choose new name ***/
 void       load_subpix            PROTO(());
 void       lock_image_db          PROTO((FITS_DB *db, char *filename));

trunk/Ohana/src/addstar/src/SkyRegionUtils.c

@@ -14 +14 @@
   /* match the basename against the GSCRegion file names */
   for (i = 0; i < input[0].Nregions; i++) {
-    status = stat ((char *) input[0].regions[i][0].filename, &filestats);
+    status = stat (input[0].filename[i], &filestats);
     if ((status == -1) && (errno == ENOENT)) continue;
     /* give an error for other conditions? */

trunk/Ohana/src/addstar/src/UpdateDatabase_Image.c

@@ -58 +58 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
 
+    catalog.filename = skylist[0].filename[i];
     load_pt_catalog (&catalog, skylist[0].regions[i]);
 

trunk/Ohana/src/addstar/src/UpdateDatabase_Refcat.c

@@ -52 +52 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
 
+    catalog.filename = skylist[0].filename[i];
     load_pt_catalog (&catalog, skylist[0].regions[i]);
 

trunk/Ohana/src/addstar/src/UpdateDatabase_Reflist.c

@@ -57 +57 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
 
+    catalog.filename = skylist[0].filename[i];
     load_pt_catalog (&catalog, skylist[0].regions[i]);
 

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

@@ -11 +11 @@
   AddstarClientOptions options;
 
-  SkyTable *sky;
-  SkyList *skylist;
+  SkyTable *sky = NULL;
+  SkyList *skylist = NULL;
 
   double dtime;
@@ -74 +74 @@
     gettimeofday (&t1, NULL);
 
-    load_pt_catalog (&catalog, skylist[0].regions[i], CATDIR);
+    catalog.filename = skylist[0].filename[i];
+    load_pt_catalog (&catalog, skylist[0].regions[i]);
 
     /* for only_match, skip empty catalogs XXX EAM : this leaves behind empty files */

trunk/Ohana/src/addstar/src/get2mass.c

@@ -31 +31 @@
     switch (mode) {
       case 0:
+        // XXX put filename from table here
         refcat = get2mass_AS_data (&sky[0].regions[i], patch, photcode, &Nrefcat);
         if (VERBOSE) fprintf (stderr, "loaded %d stars from 2MASS (allsky)\n", Nrefcat);
@@ -84 +85 @@
     if (De < patch[0].Dmin) continue;
     sprintf (datafile, "%s/%s", path, filename);
-    regions[Nregions].filename = (e_void) strcreate (datafile);
+    // XXX : put in table regions[Nregions].filename = (e_void) strcreate (datafile);
     regions[Nregions].Rmin = Rs;
     regions[Nregions].Rmax = Re;

trunk/Ohana/src/addstar/src/get2mass_as.c

@@ -55 +55 @@
   if (!FilterSkip) Shutdown ("invalid photcode %s", GetPhotcodeNamebyCode(photcode));
 
-  filename = (char *) region[0].filename;
+  // filename = (char *) region[0].filename;
   gf = gzopen (filename, "rb");
   if (gf == NULL) Shutdown ("can't read 2mass data file: %s", filename);

trunk/Ohana/src/addstar/src/get2mass_dr2.c

@@ -27 +27 @@
   fprintf (stderr, "overlap: %f - %f, %f - %f\n", RA0, RA1, DEC0, DEC1);
 
-  filename = (char *) region[0].filename;
+  // XXX get from args
+  // filename = (char *) region[0].filename;
   gf = gzopen (filename, "rb");
   if (gf == NULL) Shutdown ("can't read 2mass data file: %s", filename);

trunk/Ohana/src/addstar/src/getgsc.c

@@ -25 +25 @@
   
   for (i = 0; i < skylist[0].Nregions; i++) {
-    gsc = rd_gsc ((char *)skylist[0].regions[i][0].filename, &Ngsc);
+    // XXX : get from table gsc = rd_gsc ((char *)skylist[0].regions[i][0].filename, &Ngsc);
 
     REALLOCATE (stars, Stars, MAX (1, Nstars + Ngsc));

trunk/Ohana/src/addstar/src/load_pt_catalog.c

@@ -1 +1 @@
 # include "addstar.h"
 
-int load_pt_catalog (Catalog *catalog, SkyRegion *region, char *path) {
+int load_pt_catalog (Catalog *catalog, SkyRegion *region) {
   
-  catalog[0].filename = (char *) region[0].filename;
-
   check_permissions (catalog[0].filename);
   if (VERBOSE) fprintf (stderr, "adding to %s\n", catalog[0].filename);