Changeset 37308

Timestamp:

Aug 25, 2014, 10:48:52 AM (12 years ago)

Author:

eugene

Message:

fix isfinite definition, do not floop ipptopsps with fprintf statements

Location:

branches/eam_branches/ipp-20140813/Ohana

Files:

• . (modified) (1 prop)
• src/dvopsps/src/insert_detections_dvopsps.c (modified) (1 diff)
• src/dvopsps/src/insert_detections_dvopsps_catalog.c (modified) (4 diffs)
• src/getstar (modified) (1 prop)
• src/libohana/include/ohana.h (modified) (1 diff)

branches/eam_branches/ipp-20140813/Ohana/src/dvopsps/src/insert_detections_dvopsps.c

@@ -95 +95 @@
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
+
+    if (!status) {
+      fprintf (stderr, "failure to insert data in mysql\n");
+      exit (2);
+    }
   }
 

branches/eam_branches/ipp-20140813/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

@@ -210 +210 @@
   // XXX check return status
   if (mysql) {
-    if (DEBUG) fprintf (stderr, "%s\n", buffer->buffer);
     int mysqlStatus = mysql_query(mysql, buffer->buffer); 
     if (mysqlStatus) {
@@ -216 +215 @@
       fprintf (stderr, "%s\n", mysql_error(mysql));
       fprintf (stderr, "Nbuffer: %d\n", buffer->Nbuffer);
+      if (DEBUG) fprintf (stderr, "%s\n", buffer->buffer);
       status = FALSE;
     }
@@ -232 +232 @@
 
 int insert_detections_mysql_detvalue (IOBuffer *buffer, Detections *detection) {
+
+  if (detection->detectID == 164458937060000101) {
+    fprintf (stderr, "isfinite: %d\n", isfinite(detection->dMpsf));
+    fprintf (stderr, "isnan: %d\n", isnan(detection->dMpsf));
+    fprintf (stderr, "isinf: %d\n", isinf(detection->dMpsf));
+  }
 
   PrintIOBuffer (buffer, "(%lu, ", detection->objID);       // objID
@@ -268 +274 @@
 
   if (isfinite(flux) && (flux > 0.0)) {
-    fprintf (stderr, "how did we get here?\n");
+    // fprintf (stderr, "funny flux: %f with mag %f\n", flux, mag);
     return (zp - 2.5*log10(flux));
   }

branches/eam_branches/ipp-20140813/Ohana/src/libohana/include/ohana.h

@@ -192 +192 @@
 
 # ifndef isfinite
-# define isfinite(A) (!isnan(A))
+# define isfinite(A) (!isnan(A) && !isinf(A))
 # endif