Changeset 12220 for branches/dvo-mods-2007-02/Ohana/src/relastro/src/bcatalog.c

Timestamp:

Mar 4, 2007, 3:45:18 PM (19 years ago)

Author:

eugene

Message:

finishing up the basic code; almost compiles

File:

• branches/dvo-mods-2007-02/Ohana/src/relastro/src/bcatalog.c (modified) (5 diffs)

branches/dvo-mods-2007-02/Ohana/src/relastro/src/bcatalog.c

@@ -19 +19 @@
     if (catalog[0].average[i].Nm < 2) continue; 
 
-    /* XXX this limitation is absurd
-    if (catalog[0].average[i].R < fullregion[0].RA[0]) continue;
-    if (catalog[0].average[i].R > fullregion[0].RA[1]) continue;
-    if (catalog[0].average[i].D < fullregion[0].DEC[0]) continue;
-    if (catalog[0].average[i].D > fullregion[0].DEC[1]) continue;
-    */
-
     /* start with all stars good */
     subcatalog[0].average[Naverage] = catalog[0].average[i];
@@ -34 +27 @@
 
     if (RESET) {
-      float *p;
-      p = (PhotPrimary) ? &subcatalog[0].average[Naverage].M : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M;
-      *p = NO_MAG;
-      p = (PhotPrimary) ? &subcatalog[0].average[Naverage].dM : &subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM;
-      *p = NO_MAG;
+      // XXX reset the ra,dec coords?
       subcatalog[0].average[Naverage].code &= ~ID_STAR_FEW;
       subcatalog[0].average[Naverage].code &= ~ID_STAR_POOR;
@@ -59 +48 @@
 
       /* select measurements by quality */
-      if (catalog[0].measure[offset].dophot != 1) continue;
+      if (DophotSelect && (catalog[0].measure[offset].dophot != DophotValue)) continue;
 
       /* select measurements by mag limit */
@@ -66 +55 @@
 
       /* select measurements by measurement error */
-      if (catalog[0].measure[offset].dM > SIGMA_LIM) continue;
+      if ((SIGMA_LIM > 0) && (catalog[0].measure[offset].dM > SIGMA_LIM)) continue;
 
       /* select measurements by mag limit */
@@ -111 +100 @@
   subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
 
+  // XXX really do this or not???
   if (catalog[0].Naverage > 0) free (catalog[0].average);
   if (catalog[0].Nmeasure > 0) free (catalog[0].measure);