Changeset 16703

Timestamp:

Feb 27, 2008, 5:18:29 PM (18 years ago)

Author:

eugene

Message:

changing psfProb to psfChisq

Location:

branches/eam_branch_20080223/Ohana/src/opihi

Files:

• dvo/dbExtractMeasures.c (modified) (1 diff)
• dvo/dbFields.c (modified) (1 diff)
• dvo/gstar.c (modified) (3 diffs)
• include/dvoshell.h (modified) (1 diff)

branches/eam_branch_20080223/Ohana/src/opihi/dvo/dbExtractMeasures.c

@@ -235 +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 */

branches/eam_branch_20080223/Ohana/src/opihi/dvo/dbFields.c

@@ -148 +148 @@
   if (!strcasecmp (fieldName, "IMAGEID"))    ESCAPE (MEAS_IMAGE_ID,     MAG_NONE);
   if (!strcasecmp (fieldName, "PSF_QF"))     ESCAPE (MEAS_PSF_QF,       MAG_NONE);
-  if (!strcasecmp (fieldName, "PSF_PROB"))   ESCAPE (MEAS_PSF_PROB,     MAG_NONE);
+  if (!strcasecmp (fieldName, "PSF_CHISQ"))  ESCAPE (MEAS_PSF_CHISQ,    MAG_NONE);
   if (!strcasecmp (fieldName, "CR_NSIGMA"))  ESCAPE (MEAS_CR_NSIGMA,    MAG_NONE);
   if (!strcasecmp (fieldName, "EXT_NSIGMA")) ESCAPE (MEAS_EXT_NSIGMA,   MAG_NONE);

branches/eam_branch_20080223/Ohana/src/opihi/dvo/gstar.c

@@ -164 +164 @@
             gprint (GP_LOG, "%f",     catalog.average[k].P);
             gprint (GP_LOG, "%f",     catalog.average[k].dP);
-            gprint (GP_LOG, "%x",     catalog.average[k].objID_hi);
-            gprint (GP_LOG, "%x",     catalog.average[k].objID_lo);
+            gprint (GP_LOG, "%x",     catalog.average[k].objID);
+            gprint (GP_LOG, "%x",     catalog.average[k].catID);
         }
 
@@ -209 +209 @@
             if (FULL_OUTPUT) {
                 gprint (GP_LOG, "%f", catalog.measure[m].Mcal);
-                gprint (GP_LOG, "%f", catalog.measure[m].Mgal);
+                gprint (GP_LOG, "%f", catalog.measure[m].Map);
                 gprint (GP_LOG, "%f", pow(10.0, 0.4*catalog.measure[m].dt));
                 gprint (GP_LOG, "%f", 1.0 + catalog.measure[m].airmass);
@@ -223 +223 @@
                 gprint (GP_LOG, "%d", catalog.measure[m].imageID);
                 gprint (GP_LOG, "%f", catalog.measure[m].qPSF);
-                gprint (GP_LOG, "%f", catalog.measure[m].psfProb);
+                gprint (GP_LOG, "%f", catalog.measure[m].psfChisq);
                 gprint (GP_LOG, "%f", catalog.measure[m].crNsigma);
                 gprint (GP_LOG, "%f", catalog.measure[m].extNsigma);

branches/eam_branch_20080223/Ohana/src/opihi/include/dvoshell.h

@@ -72 +72 @@
       MEAS_IMAGE_ID, 
       MEAS_PSF_QF, 
-      MEAS_PSF_PROB, 
+      MEAS_PSF_CHISQ, 
       MEAS_CR_NSIGMA, 
       MEAS_EXT_NSIGMA,