Changeset 15038 for trunk/Ohana/src/opihi

Timestamp:

Sep 26, 2007, 5:34:27 PM (19 years ago)

Author:

eugene

Message:

various fixes to ensure data is carried from Stars to Measures correctly for PS1_DEV_1

Location:

trunk/Ohana/src/opihi/dvo

Files:

• dbExtractMeasures.c (modified) (1 diff)
• gstar.c (modified) (1 diff)
• photometry.c (modified) (5 diffs)
• pmeasure.c (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c

@@ -161 +161 @@
 //      break;
     case MEAS_FLAGS: /* ? */
-      value = measure[0].flags;
+      value = measure[0].dbFlags;
       break;
     case MEAS_XCCD: /* OK */

trunk/Ohana/src/opihi/dvo/gstar.c

@@ -172 +172 @@
                      Mcat, Mrel, catalog.measure[m].dM,
                      date, catalog.measure[m].dR, catalog.measure[m].dD,
-                     catalog.measure[m].dophot, catalog.measure[m].flags,
+                     catalog.measure[m].dophot, catalog.measure[m].dbFlags,
                      catalog.measure[m].photcode, GetPhotcodeNamebyCode (catalog.measure[m].photcode));
             free (date);

trunk/Ohana/src/opihi/dvo/photometry.c

@@ -24 +24 @@
     if (TypeSelect && (TypeValue != GetMeasureTypeCode (&M))) continue; \
     if (iMagSelect && (PhotInst (&M) < iMagMin)) continue; \
-    if (FlagSelect && (M.flags != FlagValue)) continue; \
+    if (FlagSelect && (M.dbFlags != FlagValue)) continue; \
   }
 
@@ -688 +688 @@
       for (i = 0; i < average[0].Nm; i++) {
         if (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].photcode)) continue;
-        if (measure[i].flags & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
+        if (measure[i].dbFlags & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
         value ++;
       }
@@ -698 +698 @@
         if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].photcode))) continue;
         if (ErrSelect && (measure[i].dM > ErrValue)) continue;
-        if (FlagSelect && (measure[i].flags != FlagValue)) continue;
+        if (FlagSelect && (measure[i].dbFlags != FlagValue)) continue;
         if (TypeSelect && (TypeValue != GetMeasureTypeCode (&measure[i]))) continue;
         if (iMagSelect && (PhotInst (&measure[i]) < iMagMin)) continue;
@@ -874 +874 @@
     for (i = 0; i < average[0].Nm; i++) {
       TESTCODE (code, measure[i]);
-      if (measure[i].flags && ID_MEAS_SKIP) continue;
+      if (measure[i].dbFlags && ID_MEAS_SKIP) continue;
       Nm++;
     }
@@ -1169 +1169 @@
       break;
     case MEAS_FLAGS: /* ? */
-      value = measure[0].flags;
+      value = measure[0].dbFlags;
       break;
     case MEAS_XCCD: /* OK */

trunk/Ohana/src/opihi/dvo/pmeasure.c

@@ -114 +114 @@
       for (k = 0; k < catalog.average[i].Nm; k++) {
         if (FlagClip) {
-          flags = catalog.measure[m+k].flags;
+          flags = catalog.measure[m+k].dbFlags;
           if (!(flags & FlagChoice)) continue;
         }