Changeset 6424 for trunk/Ohana/src/addstar

Timestamp:

Feb 13, 2006, 9:27:46 AM (21 years ago)

Author:

eugene

Message:

various minor fixes

Location:

trunk/Ohana/src/addstar

Files:

• include/2mass.h (modified) (1 diff)
• src/get2mass.c (modified) (5 diffs)
• src/get2mass_as.c (modified) (3 diffs)
• src/get2mass_dr2.c (modified) (2 diffs)

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

@@ -10 +10 @@
 
 SkyTable *get2mass_acc (SkyRegion *patch, char *path, char *accel);
-Stars *get2mass_2DR_data (SkyRegion *region, SkyRegion *patch, int photcode, int *nstars);
-Stars *get2mass_AS_data (SkyRegion *region, SkyRegion *patch, int phocode, int *nstars);
+Stars *get2mass_2DR_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars);
+Stars *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);

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

@@ -32 +32 @@
       case 0:
         // XXX put filename from table here
-        refcat = get2mass_AS_data (&sky[0].regions[i], patch, photcode, &Nrefcat);
+        refcat = get2mass_AS_data (&sky[0].regions[i], sky[0].filename[i], patch, photcode, &Nrefcat);
         if (VERBOSE) fprintf (stderr, "loaded %d stars from 2MASS (allsky)\n", Nrefcat);
         break;
       case 1:
-        refcat = get2mass_2DR_data (&sky[0].regions[i], patch, photcode, &Nrefcat);
+        refcat = get2mass_2DR_data (&sky[0].regions[i], sky[0].filename[i], patch, photcode, &Nrefcat);
         if (VERBOSE) fprintf (stderr, "loaded %d stars from 2MASS (dr2)\n", Nrefcat);
         break;
@@ -57 +57 @@
 
   int Nregions, NREGIONS;
-  char accelfile[1024], line[256], filename[128], datafile[256];
+  char accelfile[1024], line[256], filename[128], datafile[256], **filenames;
   FILE *f;
   double Rs, Re, Ds, De;
@@ -71 +71 @@
   NREGIONS = 200;
   ALLOCATE (regions, SkyRegion, NREGIONS);
+  ALLOCATE (filenames, char *, NREGIONS);
 
   /* read in stars line-by-line */
@@ -84 +85 @@
     if (Ds > patch[0].Dmax) continue;
     if (De < patch[0].Dmin) continue;
-    sprintf (datafile, "%s/%s", path, filename);
-    // XXX : put in table regions[Nregions].filename = (e_void) strcreate (datafile);
     regions[Nregions].Rmin = Rs;
     regions[Nregions].Rmax = Re;
     regions[Nregions].Dmin = Ds;
     regions[Nregions].Dmax = De;
+
+    sprintf (datafile, "%s/%s", path, filename);
+    filenames[Nregions] = strcreate (datafile);
+
     Nregions ++;
     CHECK_REALLOCATE (regions, SkyRegion, NREGIONS, Nregions, 20);
+    CHECK_REALLOCATE (filenames, char *, NREGIONS, Nregions, 20);
   }    
   fclose (f);
@@ -97 +101 @@
   ALLOCATE (sky, SkyTable, 1);
   sky[0].regions = regions;
+  sky[0].filename = filenames;
   sky[0].Nregions = Nregions;
   return (sky);

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

@@ -13 +13 @@
 e_time get2mass_time (char *ptr, char *buffer, int Nbound, int Nbyte);
 
-Stars *get2mass_AS_data (SkyRegion *region, SkyRegion *patch, int photcode, int *nstars) {
+Stars *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars) {
   
   int FilterSkip, TimeSkip;
@@ -20 +20 @@
   gzFile gf;
   char qc;
-  char *buffer, *filename;
+  char *buffer;
   char *p, *q, *ptr, *tmp;
   double RA, DEC, M, dM;
@@ -55 +55 @@
   if (!FilterSkip) Shutdown ("invalid photcode %s", GetPhotcodeNamebyCode(photcode));
 
-  // 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

@@ -5 +5 @@
 # define NLINE 30000
 
-Stars *get2mass_2DR_data (SkyRegion *region, SkyRegion *patch, int photcode, int *nstars) {
+Stars *get2mass_2DR_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars) {
   
   int i, Nstars, NSTARS, Nbyte, Nline;
   Stars *stars;
   gzFile gf;
-  char *buffer, *filename;
+  char *buffer;
   char line[303];
   double RA, DEC, J, H, K, dJ, dH, dK;
@@ -27 +27 @@
   fprintf (stderr, "overlap: %f - %f, %f - %f\n", RA0, RA1, DEC0, DEC1);
 
-  // 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);