Changeset 37429

Timestamp:

Sep 23, 2014, 5:42:05 PM (12 years ago)

Author:

eugene

Message:

loadstarpar populates the db

Location:

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src

Files:

• addstar.c (modified) (3 diffs)
• args_loadstarpar.c (modified) (1 diff)
• find_matches_starpar.c (modified) (7 diffs)
• loadstarpar_readstars.c (modified) (2 diffs)

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/addstar.c

@@ -132 +132 @@
       }
     }
-    MARKTIME ("load cpt: %f sec\n", dtime); RESETTIME; 
+    if (VERBOSE) MARKTIME ("load cpt: %f sec\n", dtime); RESETTIME; 
 
     // Naves_disk == 0 implies an empty catalog file
@@ -163 +163 @@
         break;
     }
-    MARKTIME ("match stars: %f sec\n", dtime); RESETTIME; 
+    if (VERBOSE) MARKTIME ("match stars: %f sec\n", dtime); RESETTIME; 
 
     /* report total updated values */
@@ -183 +183 @@
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
-    MARKTIME ("save cpt: %f sec\n", dtime); RESETTIME; 
+    if (VERBOSE) MARKTIME ("save cpt: %f sec\n", dtime); RESETTIME; 
 
     if (options.mode == ADDSTAR_MODE_REFCAT) free (stars);

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/args_loadstarpar.c

@@ -97 +97 @@
 
   if (argc < 2) {
-    fprintf (stderr, "USAGE: loadstarpar [options] (wisefile) [..more files]\n");
+    fprintf (stderr, "USAGE: loadstarpar [options] (fitsfile) [..more files]\n");
     exit (2);
   }

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/find_matches_starpar.c

@@ -22 +22 @@
   ALLOCATE (Y2, double, NAVE);
   ALLOCATE (N2, off_t,  NAVE);
-
-  ALLOCATE (catalog[0].found_t, off_t, NAVE);
 
   /* internal counters */
@@ -57 +55 @@
     RD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R, catalog[0].average[i].D, &tcoords);
     N2[i] = i;
-    catalog[0].found_t[N2[i]] = -1;
   }
   sort_coords_index (X2, Y2, N2, Nave);
@@ -88 +85 @@
     }
 
-    if (stars[N1[i]].found != -1) {
+    if (stars[N1[i]].found) {
       /* this star has already been assigned to an object in this or another catalog */
       i++;
@@ -144 +141 @@
     // XXX if I add R,D to starpar, I should rationalize R,D to the same boundary?
 
-    stars[N].found = Nstarpar;
-    catalog[0].found_t[n] = Nstarpar;
+    stars[N].found = TRUE;
     catalog[0].average[n].Nstarpar ++;
     Nstarpar ++;
@@ -156 +152 @@
 
     // skip already matched stars
-    if (stars[i].found != -1) continue;
+    if (stars[i].found) continue;
     if (!IN_REGION (stars[i].R, stars[i].D)) continue;
 
@@ -194 +190 @@
     catalog[0].starpar[Nstarpar].catID  = catID;
 
-    stars[i].found = Nstarpar;
+    stars[i].found = TRUE;
     Nstarpar ++;
     Nave ++;
@@ -204 +200 @@
  
   catalog[0].sorted = FALSE;
-
-  /* note stars which have been found in this catalog */
-  for (i = 0; i < Nstars; i++) {
-    if (stars[i].found > -1) {
-      stars[i].found = -2;
-    }
-  }
 
   /* check if the catalog has changed?  if no change, no need to write */

branches/eam_branches/ipp-20140904/Ohana/src/addstar/src/loadstarpar_readstars.c

@@ -49 +49 @@
   GET_COLUMN (glat,    "l",    float);
   GET_COLUMN (glon,    "b",    float);
-  GET_COLUMN (conv,    "conv", char);
+  GET_COLUMN (conv,    "conv", byte);
   GET_COLUMN (lnZ,     "lnZ",  float);
   GET_COLUMN (DistMag, "DM",   float);
@@ -113 +113 @@
     float dEbv     = 0.5*(errImage[i*20 + 5*0 + 3] - errImage[i*20 + 5*0 + 1]);
     float dDistMag = 0.5*(errImage[i*20 + 5*1 + 3] - errImage[i*20 + 5*1 + 1]);
-    float dFeH     = 0.5*(errImage[i*20 + 5*2 + 3] - errImage[i*20 + 5*2 + 1]);
-    float dM_r     = 0.5*(errImage[i*20 + 5*3 + 3] - errImage[i*20 + 5*3 + 1]);
+    float dM_r     = 0.5*(errImage[i*20 + 5*2 + 3] - errImage[i*20 + 5*2 + 1]);
+    float dFeH     = 0.5*(errImage[i*20 + 5*3 + 3] - errImage[i*20 + 5*3 + 1]);
 
     stars[Nstars].R = R;