Changeset 15038 for trunk/Ohana/src/opihi/dvo/photometry.c

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

File:

• trunk/Ohana/src/opihi/dvo/photometry.c (modified) (5 diffs)

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 */