Changeset 23664

Timestamp:

Apr 1, 2009, 4:44:57 PM (17 years ago)

Author:

eugene

Message:

clean up gstar output

File:

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

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

@@ -14 +14 @@
   int Nstars, found, GetMeasures, Nlo, Nhi;
   int SaveVectors;
-  Vector *vec1, *vec2, *vec3, *vec4;
+  Vector *vec1, *vec2, *vec3, *vec4, *vec5, *vec6;
   SkyTable *sky;
   SkyList *skylist;
@@ -37 +37 @@
 
   NPTS = 0;
-  vec1 = vec2 = vec3 = vec4 = NULL;
+  vec1 = vec2 = vec3 = vec4 = vec5 = vec6 = NULL;
   SaveVectors = FALSE;
   if ((N = get_argument (argc, argv, "-save"))) {
@@ -46 +46 @@
     if ((vec3 = SelectVector ("gs:z", ANYVECTOR, TRUE)) == NULL) return (FALSE);
     if ((vec4 = SelectVector ("gs:f", ANYVECTOR, TRUE)) == NULL) return (FALSE);
+    if ((vec5 = SelectVector ("gs:dr", ANYVECTOR, TRUE)) == NULL) return (FALSE);
+    if ((vec6 = SelectVector ("gs:dd", ANYVECTOR, TRUE)) == NULL) return (FALSE);
   }
 
@@ -87 +89 @@
   /* lock, load, unlock catalog */
   catalog.filename = skylist[0].filename[0];
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+  catalog.catflags = GetMeasures ? LOAD_AVES | LOAD_MEAS | LOAD_SECF : LOAD_AVES | LOAD_SECF;
   catalog.Nsecfilt = 0;
 
@@ -140 +142 @@
     ResetVector (vec3, OPIHI_FLT, NPTS);
     ResetVector (vec4, OPIHI_FLT, NPTS);
+    ResetVector (vec5, OPIHI_FLT, NPTS);
+    ResetVector (vec6, OPIHI_FLT, NPTS);
   }
 
@@ -156 +160 @@
         gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
         gprint (GP_LOG, "%11.7f ", catalog.average[k].D);
+        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, "%5d",     catalog.average[k].flags);
-
+        gprint (GP_LOG, "%5d ",     catalog.average[k].flags);
+        
         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);
-            gprint (GP_LOG, "%x",     catalog.average[k].catID);
+            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);
+            gprint (GP_LOG, "%x ",     catalog.average[k].catID);
         }
 
@@ -210 +215 @@
             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, "%7.4f ",  catalog.measure[m].dD);
             gprint (GP_LOG, "%4x ",    catalog.measure[m].photFlags);
             gprint (GP_LOG, "%3x ",    catalog.measure[m].dbFlags);
             gprint (GP_LOG, "%5d ",    catalog.measure[m].photcode);
-            gprint (GP_LOG, "%-20s  ", GetPhotcodeNamebyCode (catalog.measure[m].photcode));
-            gprint (GP_LOG, "%5.2f ",  0.01*catalog.measure[m].FWx);
+            gprint (GP_LOG, "%-20s ",  GetPhotcodeNamebyCode (catalog.measure[m].photcode));
+            gprint (GP_LOG, "%5.2f ",  0.01*catalog.measure[m].FWx);
             gprint (GP_LOG, "%5.2f ",  0.01*catalog.measure[m].FWy);
 
             if (FULL_OUTPUT) {
-                gprint (GP_LOG, "%f", catalog.measure[m].Mcal);
-                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);
-                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].psfQual);
-                gprint (GP_LOG, "%f", catalog.measure[m].psfChisq);
-                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, "%f ", catalog.measure[m].Mcal);
+                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);
+                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].psfQual);
+                gprint (GP_LOG, "%f ", catalog.measure[m].psfChisq);
+                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, "\n");
@@ -251 +256 @@
             vec3[0].elements.Flt[N] = catalog.measure[m].airmass;
             vec4[0].elements.Flt[N] = catalog.measure[m].photcode;
+            vec5[0].elements.Flt[N] = catalog.measure[m].dR;
+            vec6[0].elements.Flt[N] = catalog.measure[m].dD;
             N ++;
             if (N == NPTS - 1) {
@@ -258 +265 @@
               REALLOCATE (vec3[0].elements.Flt, opihi_flt, NPTS);
               REALLOCATE (vec4[0].elements.Flt, opihi_flt, NPTS);
+              REALLOCATE (vec5[0].elements.Flt, opihi_flt, NPTS);
+              REALLOCATE (vec6[0].elements.Flt, opihi_flt, NPTS);
             }
           }
@@ -270 +279 @@
     vec3[0].Nelements = N;
     vec4[0].Nelements = N;
+    vec5[0].Nelements = N;
+    vec6[0].Nelements = N;
   }