Changeset 39092 for trunk

Timestamp:

Nov 9, 2015, 5:52:23 PM (11 years ago)

Author:

eugene

Message:

send NULL to mysql for NAN values

Location:

trunk/Ohana/src/dvopsps/src

Files:

• insert_FWobjects_dvopsps_catalog.c (modified) (3 diffs)
• insert_diffobj_dvopsps_catalog.c (modified) (3 diffs)
• insert_objects_dvopsps_catalog.c (modified) (3 diffs)

trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c

@@ -345 +345 @@
   // XXX what rules for keeping or NAN-ing various mags?
   for (i = 0; i < Nsecfilt; i++) {
-    float meanPSFFlux    = -999.0;
-    float meanPSFFluxErr = -999.0;
-    float meanPSFFluxStd = -999.0;
+    float meanPSFFlux    = NAN;
+    float meanPSFFluxErr = NAN;
+    float meanPSFFluxStd = NAN;
     if (isfinite(secfilt->dFpsfWrp) && isfinite(secfilt->FpsfWrp)) {
       meanPSFFlux    = secfilt-> FpsfWrp;
@@ -354 +354 @@
     }
 
-    float meanKronFlux    = -999.0;
-    float meanKronFluxErr = -999.0;
-    float meanKronFluxStd = -999.0;
+    float meanKronFlux    = NAN;
+    float meanKronFluxErr = NAN;
+    float meanKronFluxStd = NAN;
     if (isfinite(secfilt->dFkronWrp) && isfinite(secfilt->FkronWrp)) {
       meanKronFlux    = secfilt-> FkronWrp;
@@ -363 +363 @@
     }
 
-    float meanApFlux    = -999.0;
-    float meanApFluxErr = -999.0;
-    float meanApFluxStd = -999.0;
+    float meanApFlux    = NAN;
+    float meanApFluxErr = NAN;
+    float meanApFluxStd = NAN;
     if (isfinite(secfilt->dFapWrp) && isfinite(secfilt->FapWrp)) {
       meanApFlux    = secfilt-> FapWrp;

trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c

@@ -223 +223 @@
   // XXX what rules for keeping or NAN-ing various mags?
   for (i = 0; i < Nsecfilt; i++) {
-    float meanPSFFlux    = -999.0;
-    float meanPSFFluxErr = -999.0;
-    float meanPSFFluxStd = -999.0;
+    float meanPSFFlux    = NAN;
+    float meanPSFFluxErr = NAN;
+    float meanPSFFluxStd = NAN;
     if (isfinite(secfilt->dFpsfWrp) && isfinite(secfilt->FpsfWrp)) {
       meanPSFFlux    = secfilt-> FpsfWrp;
@@ -232 +232 @@
     }
 
-    float meanKronFlux    = -999.0;
-    float meanKronFluxErr = -999.0;
-    float meanKronFluxStd = -999.0;
+    float meanKronFlux    = NAN;
+    float meanKronFluxErr = NAN;
+    float meanKronFluxStd = NAN;
     if (isfinite(secfilt->dFkronWrp) && isfinite(secfilt->FkronWrp)) {
       meanKronFlux    = secfilt-> FkronWrp;
@@ -241 +241 @@
     }
 
-    float meanApFlux    = -999.0;
-    float meanApFluxErr = -999.0;
-    float meanApFluxStd = -999.0;
+    float meanApFlux    = NAN;
+    float meanApFluxErr = NAN;
+    float meanApFluxStd = NAN;
     if (isfinite(secfilt->dFapWrp) && isfinite(secfilt->FapWrp)) {
       meanApFlux    = secfilt-> FapWrp;

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

@@ -281 +281 @@
   // XXX what rules for keeping or NAN-ing various mags?
   for (i = 0; i < Nsecfilt; i++) {
-    float meanPSFMag    = -999.0;
-    float meanPSFMagErr = -999.0;
-    float meanPSFMagStd = -999.0;
-    float meanPSFMagMin = -999.0;
-    float meanPSFMagMax = -999.0;
+    float meanPSFMag    = NAN;
+    float meanPSFMagErr = NAN;
+    float meanPSFMagStd = NAN;
+    float meanPSFMagMin = NAN;
+    float meanPSFMagMax = NAN;
     if (isfinite(secfilt->dM) && isfinite(secfilt->M)) {
       meanPSFMag    = secfilt->M;
@@ -294 +294 @@
     }
 
-    float meanKronMag    = -999.0;
-    float meanKronMagErr = -999.0;
-    float meanKronMagStd = -999.0;
+    float meanKronMag    = NAN;
+    float meanKronMagErr = NAN;
+    float meanKronMagStd = NAN;
     if (isfinite(secfilt->dMkron) && isfinite(secfilt->Mkron) && (secfilt->dMkron < 0.333)) {
       meanKronMag    = secfilt->Mkron;
@@ -303 +303 @@
     }
 
-    float meanApMag    = -999.0;
-    float meanApMagErr = -999.0;
-    float meanApMagStd = -999.0;
+    float meanApMag    = NAN;
+    float meanApMagErr = NAN;
+    float meanApMagStd = NAN;
     if (isfinite(secfilt->dMap) && isfinite(secfilt->Map)) {
       meanApMag    = secfilt->Map;