Changeset 34405 for trunk/Ohana/src/opihi

Timestamp:

Sep 5, 2012, 4:25:56 PM (14 years ago)

Author:

eugene

Message:

merging change from eam_branches/ipp-20120805: adding psfQF, psfQFperf to both average and measure; deprecate average.Xp

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi (modified) (1 prop)
• src/opihi/cmd.astro (modified) (1 prop)
• src/opihi/dvo/avextract.c (modified) (1 diff)
• src/opihi/dvo/avmatch.c (modified) (1 diff)
• src/opihi/dvo/gstar.c (modified) (3 diffs)
• src/opihi/dvo/photometry.c (modified) (3 diffs)

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

@@ -325 +325 @@
     gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for average magnitude in this photcode\n");
 
-    // gprint (GP_ERR, "  Xp : NOT VALID\n");
     // gprint (GP_ERR, "  type : dophot type (unused)\n");
     // gprint (GP_ERR, "  typefrac : dophot type fraction (unused)\n");

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

@@ -351 +351 @@
     gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for average magnitude in this photcode\n");
 
-    // gprint (GP_ERR, "  Xp : NOT VALID\n");
     // gprint (GP_ERR, "  type : dophot type (unused)\n");
     // gprint (GP_ERR, "  typefrac : dophot type fraction (unused)\n");

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

@@ -190 +190 @@
         gprint (GP_LOG, "%5.2f ",   3600.0*sqrt(r));
         gprint (GP_LOG, "%3d   ",  catalog.average[k].Nmeasure);
-        gprint (GP_LOG, "%4.1f ",  0.01*catalog.average[k].Xp);
+        gprint (GP_LOG, "%4.1f ",  catalog.average[k].ChiSqAve);
         gprint (GP_LOG, "%5x ",    catalog.average[k].flags);
         gprint (GP_LOG, "%x ",     catalog.average[k].objID);
@@ -205 +205 @@
             gprint (GP_LOG, "%f   ",     catalog.average[k].dP);
 
-            gprint (GP_LOG, "%f   ",     catalog.average[k].ChiSqAve);
             gprint (GP_LOG, "%f   ",     catalog.average[k].ChiSqPM);
             gprint (GP_LOG, "%f   ",     catalog.average[k].ChiSqPar);
@@ -292 +291 @@
                 gprint (GP_LOG, "0x%08x ", catalog.measure[m].detID);
                 gprint (GP_LOG, "0x%08x ", catalog.measure[m].imageID);
-                gprint (GP_LOG, "%.3f ", catalog.measure[m].psfQual);
+                gprint (GP_LOG, "%.3f ", catalog.measure[m].psfQF);
                 gprint (GP_LOG, "%.1f ", catalog.measure[m].psfChisq);
                 gprint (GP_LOG, "%.1f ", catalog.measure[m].crNsigma);

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

@@ -226 +226 @@
   if (!strcasecmp (parname, "Nmeas")) param = AVE_NMEAS;
   if (!strcasecmp (parname, "Nmiss")) param = AVE_NMISS;
-  if (!strcasecmp (parname, "Xp"))    param = AVE_Xp;
   if (!strcasecmp (parname, "Xm"))    param = AVE_Xm;
   if (!strcasecmp (parname, "flag"))  param = AVE_OBJ_FLAGS;
@@ -294 +293 @@
 void GetAverageParamHelp () {
   gprint (GP_ERR, "value may be one of the following:\n");
-  gprint (GP_ERR, " ra dec dmag Nmeas Nmiss Xm Xp Nphot Ncode flag type typefrac\n\n");
+  gprint (GP_ERR, " ra dec dmag Nmeas Nmiss Xm Nphot Ncode flag type typefrac\n\n");
   gprint (GP_ERR, "value may also be a valid photcode\n");
   gprint (GP_ERR, "photcodes or 'mag' may have optional magnitude mode: mag,[Mave, Mref]\n");
@@ -637 +636 @@
     case AVE_NMISS:
       value = average[0].Nmissing;
-      break;
-    case AVE_Xp:
-      value = 0.01*average[0].Xp;
       break;
     case AVE_OBJ_FLAGS: