Changeset 7780

Timestamp:

Jun 30, 2006, 7:14:09 PM (20 years ago)

Author:

eugene

Message:

update addstar

Location:

trunk/Ohana/src/addstar

Files:

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

trunk/Ohana/src/addstar/Makefile

@@ -38 +38 @@
 $(SRC)/get2mass.$(ARCH).o \
 $(SRC)/get2mass_as.$(ARCH).o \
+$(SRC)/get2mass_ops.$(ARCH).o \
 $(SRC)/get2mass_as_raw.$(ARCH).o \
 $(SRC)/get2mass_dr2.$(ARCH).o \

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

@@ -36 +36 @@
 int get2mass_3star (Stars *star, char *line, int Nmax);
 int load2mass_catalog (Catalog *catalog, Stars *stars, int Nstars);
+
+int get2mass_setup (int photcode);
+int get2mass_coords (char *line, double *R, double *D, int Nmax);

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

@@ -15 +15 @@
   FilterSkip = TimeSkip = Qentry = 0;
   Photcode = photcode;
+  if (photcode == -1) return TRUE;
 
   if (photcode == TM_J) {

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

@@ -5 +5 @@
 
   char *path;
-  int i, N, Nrefcat;
+  int i;
   SkyTable *sky, *sky2mass;
   AddstarClientOptions options;
@@ -23 +23 @@
   
   for (i = 0; i < sky2mass[0].Nregions; i++) {
-    fprintf (stderr, "loading %s\n", sky[0].filename[i]);
+    fprintf (stderr, "loading %s\n", sky2mass[0].filename[i]);
     load2mass_as_rawdata (sky, sky2mass[0].filename[i], options);
   }

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

@@ -6 +6 @@
  */
 
-/* read in chunks of ~16MB */
+/* read in chunks of ~64MB */
 # define NBYTE 0x4000000
 # define NBREC 330
-# define DEBUG 1
+# define DEBUG 0
 
 int load2mass_as_rawdata (SkyTable *skytable, char *filename, AddstarClientOptions options) {
@@ -22 +22 @@
   char *buffer, *p, *q;
 
-  Stars *stars, **subset;
+  Stars *stars;
   TMStars *tstars;
   SkyList *skylist;
@@ -28 +28 @@
   Catalog catalog;
 
-  get2mass_setup (options.photcode);
+  get2mass_setup (-1);
 
   catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
@@ -136 +136 @@
         tstars[j].flag = TRUE;
 
-        Nstars ++;
-        CHECK_REALLOCATE (stars, Stars, NSTARS, Nstars, 3000);
+        Nstars += 3;
+        if (Nstars >= NSTARS - 3) {
+          NSTARS += 3000;
+          REALLOCATE (stars, Stars, NSTARS);
+        }
       }
       if (!Nstars) {
@@ -155 +158 @@
         // assume no input star matches an existing star 
         // simply add to the existing table
-        load2mass_catalog (catalog, stars, Nstars);
+        load2mass_catalog (&catalog, stars, Nstars);
 
         wcatalog (&catalog);

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

@@ -2 +2 @@
 
 int load2mass_catalog (Catalog *catalog, Stars *stars, int Nstars) {
+
+  int i, j, Nsec, Nmeas, Nave, NMEAS, NAVE;
 
   Nsec = GetPhotcodeNsecfilt ();