Changeset 16810 for trunk/Ohana/src/opihi/dvo/gstar.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/gstar.c (modified) (5 diffs)

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

@@ -151 +151 @@
         gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
         gprint (GP_LOG, "%11.7f ", catalog.average[k].D);
-        gprint (GP_LOG, "%3d   ",  catalog.average[k].Nm);
+        gprint (GP_LOG, "%3d   ",  catalog.average[k].Nmeasure);
         gprint (GP_LOG, "%4.1f ",  0.01*catalog.average[k].Xp);
         gprint (GP_LOG, "%5d",     catalog.average[k].code);
@@ -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);
         }
 
@@ -188 +188 @@
 
       if (GetMeasures || SaveVectors) {
-        m = catalog.average[k].offset;
-        for (j = 0; j < catalog.average[k].Nm; j++, m++) {
+        m = catalog.average[k].measureOffset;
+        for (j = 0; j < catalog.average[k].Nmeasure; j++, m++) {
 
           Mcat = PhotCat (&catalog.measure[m]);
@@ -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);