Changeset 35221

Timestamp:

Mar 2, 2013, 3:21:16 PM (13 years ago)

Author:

eugene

Message:

supply explicit precision values for mysql conversion

Location:

trunk/Ohana/src/dvopsps/src

Files:

• insert_detections_dvopsps.c (modified) (1 diff)
• insert_detections_dvopsps_catalog.c (modified) (1 diff)
• insert_objects_dvopsps_catalog.c (modified) (2 diffs)

trunk/Ohana/src/dvopsps/src/insert_detections_dvopsps.c

@@ -249 +249 @@
   PrintIOBuffer (buffer, "%lu, ", detection->objID);      // objID
   PrintIOBuffer (buffer, "%u, ", detection->flags);       // flags
-  PRINT_FLOAT(buffer, detection->zp, "%f, ");
-  PRINT_FLOAT(buffer, detection->zpErr, "%f, ");
-  PRINT_FLOAT(buffer, detection->airMass, "%f, ");
-  PRINT_FLOAT(buffer, detection->expTime, "%f, ");
-  PRINT_FLOAT(buffer, detection->ra, "%lf, ");
-  PRINT_FLOAT(buffer, detection->dec, "%lf, ");
-  PRINT_FLOAT(buffer, detection->raErr, "%f, ");
-  PRINT_FLOAT(buffer, detection->decErr, "%f),\n");
+  PRINT_FLOAT(buffer, detection->zp,      "%.6f, ");
+  PRINT_FLOAT(buffer, detection->zpErr,   "%.6f, ");
+  PRINT_FLOAT(buffer, detection->airMass, "%.6f, ");
+  PRINT_FLOAT(buffer, detection->expTime, "%.6f, ");
+  PRINT_FLOAT(buffer, detection->ra,      "%.8f, ");
+  PRINT_FLOAT(buffer, detection->dec,     "%.8f, ");
+  PRINT_FLOAT(buffer, detection->raErr,   "%.6f, ");
+  PRINT_FLOAT(buffer, detection->decErr,  "%.6f),\n");
   return TRUE;
 }

trunk/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

@@ -188 +188 @@
   PrintIOBuffer (buffer, "%lu, ", average->extID);        // objID
   PrintIOBuffer (buffer, "%u, ", measure->dbFlags);       // flags
-  PRINT_FLOAT(buffer, code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal, "%f, ");
-  PRINT_FLOAT(buffer, measure->dMcal, "%f, ");
-  PRINT_FLOAT(buffer, measure->airmass, "%f, ");
-  PRINT_FLOAT(buffer, pow(10.0, 0.4 * measure->dt), "%f, ");
-  PRINT_FLOAT(buffer, average->R - measure->dR / 3600., "%lf, ");
-  PRINT_FLOAT(buffer, average->D - measure->dD / 3600., "%lf, ");
-  PRINT_FLOAT(buffer, measure->dXccd * 0.01 * fabs(measure->pltscale), "%f, ");
-  PRINT_FLOAT(buffer, measure->dYccd * 0.01 * fabs(measure->pltscale), "%f),\n");
+  float zp = code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal;
+  float exptime = pow(10.0, 0.4 * measure->dt);
+  double ra  = average->R - measure->dR / 3600.0;
+  double dec = average->D - measure->dD / 3600.0;
+  double dR = measure->dXccd * 0.01 * fabs(measure->pltscale);
+  double dD = measure->dYccd * 0.01 * fabs(measure->pltscale);
+
+  PRINT_FLOAT(buffer, zp,               "%.6f, ");
+  PRINT_FLOAT(buffer, measure->dMcal,   "%.6f, ");
+  PRINT_FLOAT(buffer, measure->airmass, "%.6f, ");
+  PRINT_FLOAT(buffer, exptime,          "%.6f, ");
+  PRINT_FLOAT(buffer, ra,               "%.8f, ");
+  PRINT_FLOAT(buffer, dec,              "%.8f, ");
+  PRINT_FLOAT(buffer, dR,               "%.6f, ");
+  PRINT_FLOAT(buffer, dD,               "%.6f),\n");
   
   return TRUE;

trunk/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c

@@ -263 +263 @@
 // XXX this bit could/should be autocoded...
   PrintIOBuffer (ave_buffer, " (");
-  PRINT_FLOAT(ave_buffer, average->R, "%lf, ");
-  PRINT_FLOAT(ave_buffer, average->D, "%lf, ");
-  PRINT_FLOAT(ave_buffer, average->dR, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->dD, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->uR, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->uD, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->duR, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->duD, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->P, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->dP, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->ChiSqAve, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->ChiSqPM, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->ChiSqPar, "%f, ");
+  PRINT_FLOAT(ave_buffer, average->R,        "%.8f, ");  // 0.036 mas precision 
+  PRINT_FLOAT(ave_buffer, average->D,        "%.8f, ");  // 0.036 mas precision 
+  PRINT_FLOAT(ave_buffer, average->dR,       "%.5f, ");  // 0.010 mas precision
+  PRINT_FLOAT(ave_buffer, average->dD,       "%.5f, ");  // 0.010 mas precision
+  PRINT_FLOAT(ave_buffer, average->uR,       "%.5f, ");  // 0.010 mas/yr precision
+  PRINT_FLOAT(ave_buffer, average->uD,       "%.5f, ");
+  PRINT_FLOAT(ave_buffer, average->duR,      "%.5f, ");
+  PRINT_FLOAT(ave_buffer, average->duD,      "%.5f, ");
+  PRINT_FLOAT(ave_buffer, average->P,        "%.5f, ");
+  PRINT_FLOAT(ave_buffer, average->dP,       "%.5f, ");
+  PRINT_FLOAT(ave_buffer, average->ChiSqAve, "%.4f, ");
+  PRINT_FLOAT(ave_buffer, average->ChiSqPM,  "%.4f, ");
+  PRINT_FLOAT(ave_buffer, average->ChiSqPar, "%.4f, ");
   PrintIOBuffer (ave_buffer, "%d, ",  average->Tmean);          
   PrintIOBuffer (ave_buffer, "%d, ",  average->Trange);         
-  PRINT_FLOAT(ave_buffer, average->psfQF, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->psfQFperf, "%f, ");
-  PRINT_FLOAT(ave_buffer, average->stargal, "%f, ");
+  PRINT_FLOAT(ave_buffer, average->psfQF,     "%.3f, ");
+  PRINT_FLOAT(ave_buffer, average->psfQFperf, "%.3f, ");
+  PRINT_FLOAT(ave_buffer, average->stargal,   "%.3f, ");
   PrintIOBuffer (ave_buffer, "%hu, ", average->Npos);           
   PrintIOBuffer (ave_buffer, "%hu, ", average->Nmeasure);       
@@ -299 +299 @@
   for (i = 0; i < Nsecfilt; i++) {
     PrintIOBuffer (sec_buffer, " (");
-    PRINT_FLOAT(sec_buffer, secfilt->M, "%f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->Map, "%f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->Mkron, "%f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->dMkron, "%f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->dM, "%f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->Xm, "%f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->FluxPSF, "%f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->dFluxPSF, "%f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->FluxKron, "%f, ");
-    PRINT_FLOAT(sec_buffer, secfilt->dFluxKron, "%f, ");
+    PRINT_FLOAT(sec_buffer, secfilt->M,         "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, secfilt->Map,       "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, secfilt->Mkron,     "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, secfilt->dMkron,    "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, secfilt->dM,        "%.6f, "); // umag precision
+    PRINT_FLOAT(sec_buffer, secfilt->Xm,        "%.6f, ");
+    PRINT_FLOAT(sec_buffer, secfilt->FluxPSF,   "%.6e, "); // 0.36 umag precision
+    PRINT_FLOAT(sec_buffer, secfilt->dFluxPSF,  "%.6e, "); // 0.36 umag precision
+    PRINT_FLOAT(sec_buffer, secfilt->FluxKron,  "%.6e, "); // 0.36 umag precision
+    PRINT_FLOAT(sec_buffer, secfilt->dFluxKron, "%.6e, "); // 0.36 umag precision
     PrintIOBuffer (sec_buffer, "%u,  ", secfilt->flags);       
     PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Ncode);