Changeset 37361

Timestamp:

Sep 4, 2014, 7:57:53 AM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140813

Location:

trunk/Ohana/src/dvopsps/src

Files:

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

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

@@ -68 +68 @@
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
-    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
+    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "r")) {
       fprintf (stderr, "ERROR: failure reading catalog %s\n", catalog.filename);
       exit (1);
@@ -95 +95 @@
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
+
+    if (!status) {
+      fprintf (stderr, "failure to insert data in mysql\n");
+      exit (2);
+    }
   }
 

trunk/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));
   }

trunk/Ohana/src/dvopsps/src/insert_objects_dvopsps.c

@@ -56 +56 @@
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
 
-    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
+    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "r")) {
       fprintf (stderr, "ERROR: failure reading catalog %s\n", catalog.filename);
       exit (1);