Changeset 16810 for trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c

Timestamp:

Mar 4, 2008, 12:39:41 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080223 : updates to DVO output format, addstar (SDSS and 2MASS flags), relastro (FitChip)

File:

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

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

@@ -1 +1 @@
 # include "dvoshell.h"
+
+// to add a new field to the extractions:
+// 1) add the selection for the field below
+// 2) add the field to the ParseMeasureField in dbFields.c
+// 3) add the field to the measure enum list in dvoshell.h
 
 /* time concepts */
@@ -111 +116 @@
       break;
     case MEAS_NMEAS: /* OK */
-      value = average[0].Nm;
+      value = average[0].Nmeasure;
       break;
     case MEAS_NMISS: /* OK */
-      value = average[0].Nn;
+      value = average[0].Nmissing;
       break;
     case MEAS_OBJFLAGS: /* OK */
@@ -171 +176 @@
     case MEAS_XCCD: /* OK */
 /* I need to perform this conversion for ELIXIR and LONEOS formats on load */      
-# if 0
+# if 1
       value = measure[0].Xccd;
 # else
@@ -184 +189 @@
     case MEAS_YCCD: /* OK */
 /* I need to perform this conversion for ELIXIR and LONEOS formats on load */      
-# if 0
+# if 1
       value = measure[0].Yccd;
 # else
@@ -230 +235 @@
       value = measure[0].qPSF;
       break;
-    case MEAS_PSF_PROB: /* OK */
-      value = measure[0].psfProb;
+    case MEAS_PSF_CHISQ: /* OK */
+      value = measure[0].psfChisq;
       break;
     case MEAS_CR_NSIGMA: /* OK */