Changeset 29001 for trunk/Ohana/src/addstar

Timestamp:

Aug 20, 2010, 12:05:07 PM (16 years ago)

Author:

eugene

Message:

optimizations for dvomerge and relastro; complete checks of db I/O success; fix overloaded image flags

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/src/FilterStars.c (modified) (1 diff)
• src/addstar/src/LoadData.c (modified) (1 diff)
• src/addstar/src/ReadStarsFITS.c (modified) (7 diffs)
• src/addstar/src/find_matches_refstars.c (modified) (2 diffs)
• src/addstar/test/dvomerge.dvo (modified) (1 diff)

trunk/Ohana/src/addstar/src/FilterStars.c

@@ -1 +1 @@
 # include "addstar.h"
-#include "pslib/psMetadata.h"
-#include "psmodules/pmSourceMasks.h"
 # define EXTERNAL_ID TRUE
 

trunk/Ohana/src/addstar/src/LoadData.c

@@ -80 +80 @@
          
     inStars = ReadStarsFITS (f, headers[Nhead], headers[Ndata], &images[0][Nvalid].nstar);
+    if (!inStars) {
+      // XXX need to free the data here or in ReadStarsFITS on error
+      continue;
+    }
     inStars = FilterStars (inStars, &images[0][Nvalid], Nvalid, options);
     *stars = MergeStars (*stars, Nstars, inStars, images[0][Nvalid].nstar);

trunk/Ohana/src/addstar/src/ReadStarsFITS.c

@@ -49 +49 @@
   if (stars == NULL) {
     fprintf (stderr, "ERROR: invalid table type %s\n", type);
-    exit (1);
+    return (NULL);
   }
   // Nstars is not necessarily == *nstars (The former is the number of detections, the
@@ -69 +69 @@
   swapped = FALSE;
   smpdata = gfits_table_get_SMPData (table, &Nstars, &swapped);
+  if (!smpdata) {
+    fprintf (stderr, "skipping inconsistent entry\n");
+    return (NULL);
+  }
   ZeroPt = GetZeroPoint();
 
@@ -108 +112 @@
 
   ps1data = gfits_table_get_PS1_DEV_0 (table, &Nstars, NULL);
+  if (!ps1data) {
+    fprintf (stderr, "skipping inconsistent entry\n");
+    return (NULL);
+  }
   ZeroPt = GetZeroPoint();
 
@@ -153 +161 @@
 
   ps1data = gfits_table_get_PS1_DEV_1 (table, &Nstars, NULL);
+  if (!ps1data) {
+    fprintf (stderr, "skipping inconsistent entry\n");
+    return (NULL);
+  }
   ZeroPt = GetZeroPoint();
 
@@ -212 +224 @@
 
   ps1data = gfits_table_get_CMF_PS1_V1 (table, &Nstars, NULL);
+  if (!ps1data) {
+    fprintf (stderr, "skipping inconsistent entry\n");
+    return (NULL);
+  }
   ZeroPt = GetZeroPoint();
 
@@ -284 +300 @@
 
   ps1data = gfits_table_get_CMF_PS1_V1_Alt (table, &Nstars, NULL);
+  if (!ps1data) {
+    fprintf (stderr, "skipping inconsistent entry\n");
+    return (NULL);
+  }
   ZeroPt = GetZeroPoint();
 
@@ -348 +368 @@
 
   ps1data = gfits_table_get_CMF_PS1_V2 (table, &Nstars, NULL);
+  if (!ps1data) {
+    fprintf (stderr, "skipping inconsistent entry\n");
+    return (NULL);
+  }
   ZeroPt = GetZeroPoint();
 

trunk/Ohana/src/addstar/src/find_matches_refstars.c

@@ -218 +218 @@
     }
 
-    N = N1[i];
+    N = i;
     if (stars[N][0].found > -1) continue;
     if (!IN_REGION (stars[N][0].average.R, stars[N][0].average.D)) continue;
@@ -286 +286 @@
 
     for (j = 0; j < NREFSTAR_GROUP; j++) {
-      N = N1[i + j];
+      N = i + j;
 
       catalog[0].measure[Nmeas]          = stars[N][0].measure;

trunk/Ohana/src/addstar/test/dvomerge.dvo

@@ -95 +95 @@
     subset T = t if (id == imageID[$i])
     set dT = T - time[$i]
-    vstat -q dT 
+    vstat dT 
     tapOK {abs($MEAN)  < 0.00001} "time for measure ID $i (MEAN)"
     tapOK {abs($SIGMA) < 0.00001} "time for measure ID $i (SIGMA)"