Changeset 7742

Timestamp:

Jun 28, 2006, 5:06:50 PM (20 years ago)

Author:

eugene

Message:

fixing load2mass

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (1 diff)
• include/2mass.h (modified) (1 diff)
• src/load2mass_as_rawdata.c (modified) (2 diffs)
• src/load2mass_catalog.c (added)

trunk/Ohana/src/addstar/Makefile

@@ -94 +94 @@
 $(SRC)/load2mass.$(ARCH).o \
 $(SRC)/load2mass_as_rawdata.$(ARCH).o \
+$(SRC)/load2mass_catalog.$(ARCH).o \
 $(SRC)/get2mass_ops.$(ARCH).o \
 $(SRC)/find_matches_refstars.$(ARCH).o \

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

@@ -35 +35 @@
 SkyTable *load2mass_acc (char *path, char *accel);
 int get2mass_3star (Stars *star, char *line, int Nmax);
+int load2mass_catalog (Catalog *catalog, Stars *stars, int Nstars);

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

@@ -126 +126 @@
 
         stars[Nstars+0].R = tstars[j].R;
-        stars[Nstars+0].D = tstars[j].R;
-        // stars[Nstars+1].R = tstars[j].R;
-        // stars[Nstars+1].D = tstars[j].R;
-        // stars[Nstars+2].R = tstars[j].R;
-        // stars[Nstars+2].D = tstars[j].R;
-        // get2mass_3star (&stars[Nstars], &buffer[offset], Nbyte - offset);
-        
-        get2mass_star (&stars[Nstars], &buffer[offset], Nbyte - offset);
+        stars[Nstars+0].D = tstars[j].D;
+        stars[Nstars+1].R = tstars[j].R;
+        stars[Nstars+1].D = tstars[j].D;
+        stars[Nstars+2].R = tstars[j].R;
+        stars[Nstars+2].D = tstars[j].D;
+        get2mass_3star (&stars[Nstars], &buffer[offset], Nbyte - offset);
+        // get2mass_star (&stars[Nstars], &buffer[offset], Nbyte - offset);
+
         tstars[j].flag = TRUE;
 
@@ -153 +153 @@
         load_pt_catalog (&catalog, skylist[0].regions[0]);
 
-        // create the subset pointers
-        ALLOCATE (subset, Stars *, Nstars);
-        for (j = 0; j < Nstars; j++) subset[j] = &stars[j];
-
-        find_matches_refstars (skylist[0].regions[0], subset, Nstars, &catalog, options);
-        free (subset);
+        // assume no input star matches an existing star 
+        // simply add to the existing table
+        load2mass_catalog (catalog, stars, Nstars);
 
         wcatalog (&catalog);