Changeset 5451 for trunk/Ohana/src/addstar

Timestamp:

Oct 27, 2005, 7:10:17 PM (21 years ago)

Author:

eugene

Message:

working on SkyRegion conversion

Location:

trunk/Ohana/src/addstar/src

Files:

• SkyRegionUtils.c (modified) (3 diffs)
• get2mass.c (modified) (1 diff)
• get2mass_as.c (modified) (1 diff)
• get2mass_dr2.c (modified) (1 diff)
• getgsc.c (modified) (2 diffs)
• load_pt_catalog.c (modified) (1 diff)

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

@@ -4 +4 @@
   
   int i, status, Nsubset, NSUBSET;
-  char filename[256];
   SkyList *subset;
   struct stat filestats;
@@ -15 +14 @@
   /* match the basename against the GSCRegion file names */
   for (i = 0; i < input[0].Nregions; i++) {
-    status = stat (input[0].regions[i][0].filename, &filestats);
+    status = stat ((char *) input[0].regions[i][0].filename, &filestats);
     if ((status == -1) && (errno == ENOENT)) continue;
     /* give an error for other conditions? */
@@ -26 +25 @@
   return (subset);
 }
-
-int SkyTableSetDepth (SkyTable *sky, int depth) {
-
-  int i;
-
-  for (i = 0; i < sky[0].Nregions; i++) {
-    sky[0].regions[i].table = (sky[0].regions[i].depth == depth);
-  }
-  return (TRUE);
-}
-

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

@@ -84 +84 @@
     if (De < patch[0].Dmin) continue;
     sprintf (datafile, "%s/%s", path, filename);
-    regions[Nregions].filename = strcreate (datafile);
+    regions[Nregions].filename = (e_void) strcreate (datafile);
     regions[Nregions].Rmin = Rs;
     regions[Nregions].Rmax = Re;

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

@@ -51 +51 @@
   if (!FilterSkip) Shutdown ("invalid photcode %s", GetPhotcodeNamebyCode(photcode));
 
-  filename = 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 = 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/getgsc.c

@@ -18 +18 @@
   /* load regions from GSC table, restrict to patch */
   sky = SkyTableFromGSC (GSCFILE, 2, VERBOSE);
-  SkyTableSetPath (sky, GSCDIR, "cpt");
+  SkyTableSetFilenames (sky, GSCDIR, "cpt");
   skylist = SkyListByPatch (sky, -1, patch);
   
@@ -25 +25 @@
   
   for (i = 0; i < skylist[0].Nregions; i++) {
-    gsc = rd_gsc (skylist[0].regions[i][0].filename, &Ngsc);
+    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

@@ -3 +3 @@
 int load_pt_catalog (Catalog *catalog, SkyRegion *region, char *path) {
   
-  char filename[256];
-
-  catalog[0].filename = region[0].filename;
+  catalog[0].filename = (char *) region[0].filename;
 
   check_permissions (catalog[0].filename);