Changeset 36910 for branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/avextract.c

Timestamp:

Jun 19, 2014, 8:11:39 AM (12 years ago)

Author:

eugene

Message:

rework dvo db photcode-related selection logic: allow fields of the form mag:psf:inst or g:ave:psf:stk, with arbitrary combinations; PhotInst, etc, now take options for mag class, etc

File:

• branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/avextract.c (modified) (1 diff)

branches/eam_branches/ipp-20140610/Ohana/src/opihi/dvo/avextract.c

@@ -166 +166 @@
   needMeasures = FALSE;
   for (i = 0; !needMeasures && (i < Nfields); i++) {
-    if (fields[i].magMode == MAG_NONE) continue;
-    if (fields[i].photcode == NULL) continue; // assert this?
+    if (fields[i].photcode == NULL) continue; // non-measure fields do not have a photcode
     if (fields[i].photcode[0].type == PHOT_REF) needMeasures = TRUE;
     if (fields[i].photcode[0].type == PHOT_DEP) needMeasures = TRUE;