Changeset 15208 for trunk/Ohana/src/opihi/dvo/gstar.c

Timestamp:

Oct 3, 2007, 4:55:24 PM (19 years ago)

Author:

eugene

Message:

updates to the db interations

File:

• trunk/Ohana/src/opihi/dvo/gstar.c (modified) (4 diffs)

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

@@ -11 +11 @@
   double Mcat, Mrel;
   float *RA, *DEC;
-  int i, j, k, m, N, *N1, Nsecfilt, NPTS, QUIET;
+  int i, j, k, m, N, *N1, Nsecfilt, NPTS, QUIET, FULL_OUTPUT;
   int Nstars, found, GetMeasures, Nlo, Nhi;
   int SaveVectors;
@@ -42 +42 @@
   }
 
+  FULL_OUTPUT = FALSE;
+  if ((N = get_argument (argc, argv, "-full"))) {
+    FULL_OUTPUT = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+
   GetMeasures = FALSE;
   if ((N = get_argument (argc, argv, "-m"))) {
+    GetMeasures = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-meas"))) {
     GetMeasures = TRUE;
     remove_argument (N, &argc, argv);
@@ -139 +149 @@
       if (!QUIET) {
         gprint (GP_LOG, "star: %d\n", k);
-        gprint (GP_LOG, "%11.7f %11.7f %3d of %3d  %4.1f %5d\n", catalog.average[k].R, catalog.average[k].D, 
-                 catalog.average[k].Nm, catalog.average[k].Nn + catalog.average[k].Nm,
-                 0.01*catalog.average[k].Xp, catalog.average[k].code);
+        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, "%4.1f ",  0.01*catalog.average[k].Xp);
+        gprint (GP_LOG, "%5d",     catalog.average[k].code);
+
+        if (FULL_OUTPUT) {
+            gprint (GP_LOG, "%f",     catalog.average[k].dR);
+            gprint (GP_LOG, "%f",     catalog.average[k].dD);
+            gprint (GP_LOG, "%f",     catalog.average[k].uR);
+            gprint (GP_LOG, "%f",     catalog.average[k].uD);
+            gprint (GP_LOG, "%f",     catalog.average[k].duR);
+            gprint (GP_LOG, "%f",     catalog.average[k].duD);
+            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, "\n");
       
         /* filter names */
@@ -169 +196 @@
           if (GetMeasures && !QUIET) {
             date = ohana_sec_to_date (catalog.measure[m].t);
-            gprint (GP_LOG, "%6.3f %6.3f %5.3f  %20s  %5.2f %5.2f %2d %3x %3d %-20s\n", 
-                     Mcat, Mrel, catalog.measure[m].dM,
-                     date, catalog.measure[m].dR, catalog.measure[m].dD,
-                     catalog.measure[m].dophot, catalog.measure[m].dbFlags,
-                     catalog.measure[m].photcode, GetPhotcodeNamebyCode (catalog.measure[m].photcode));
+            gprint (GP_LOG, "%6.3f ",  Mcat);
+            gprint (GP_LOG, "%6.3f ",  Mrel);
+            gprint (GP_LOG, "%5.3f  ", catalog.measure[m].dM);
+            gprint (GP_LOG, "%20s  ",  date);
+            gprint (GP_LOG, "%7.4f ",  catalog.measure[m].dR);
+            gprint (GP_LOG, "%7.4f",   catalog.measure[m].dD);
+            gprint (GP_LOG, "%2d ",    catalog.measure[m].dophot);
+            gprint (GP_LOG, "%3x ",    catalog.measure[m].dbFlags);
+            gprint (GP_LOG, "%3d ",    catalog.measure[m].photcode);
+            gprint (GP_LOG, "%-20s  ", GetPhotcodeNamebyCode (catalog.measure[m].photcode));
+
+            if (FULL_OUTPUT) {
+                gprint (GP_LOG, "%f", catalog.measure[m].Mcal);
+                gprint (GP_LOG, "%f", catalog.measure[m].Mgal);
+                gprint (GP_LOG, "%f", pow(10.0, 0.4*catalog.measure[m].dt));
+                gprint (GP_LOG, "%f", 1.0 + catalog.measure[m].airmass);
+                gprint (GP_LOG, "%f", catalog.measure[m].az);
+                gprint (GP_LOG, "%f", catalog.measure[m].Xccd);
+                gprint (GP_LOG, "%f", catalog.measure[m].Yccd);
+                gprint (GP_LOG, "%d", catalog.measure[m].dXccd);
+                gprint (GP_LOG, "%d", catalog.measure[m].dYccd);
+                gprint (GP_LOG, "%f", catalog.measure[m].Sky);
+                gprint (GP_LOG, "%f", catalog.measure[m].dSky);
+                gprint (GP_LOG, "%d", catalog.measure[m].averef);
+                gprint (GP_LOG, "%d", catalog.measure[m].detID);
+                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].crNsigma);
+                gprint (GP_LOG, "%f", catalog.measure[m].extNsigma);
+                gprint (GP_LOG, "%f", 0.01*catalog.measure[m].FWx);
+                gprint (GP_LOG, "%f", 0.01*catalog.measure[m].FWy);
+                gprint (GP_LOG, "%f", (360.0/(float)0xffff)*catalog.measure[m].theta);
+
+                gprint (GP_LOG, "%x", catalog.measure[m].photFlags);
+                gprint (GP_LOG, "%d", catalog.measure[m].stargal);
+            }
+            gprint (GP_LOG, "\n");
+
             free (date);
           }