Index: /trunk/Ohana/src/dvopsps/Makefile =================================================================== --- /trunk/Ohana/src/dvopsps/Makefile (revision 37922) +++ /trunk/Ohana/src/dvopsps/Makefile (revision 37923) @@ -32,4 +32,6 @@ $(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \ $(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \ +$(SRC)/insert_diffobj_dvopsps.$(ARCH).o \ +$(SRC)/insert_diffobj_dvopsps_catalog.$(ARCH).o \ $(SRC)/insert_detections_dvopsps.$(ARCH).o \ $(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o @@ -50,4 +52,6 @@ $(SRC)/insert_FWobjects_dvopsps.$(ARCH).o \ $(SRC)/insert_FWobjects_dvopsps_catalog.$(ARCH).o \ +$(SRC)/insert_diffobj_dvopsps.$(ARCH).o \ +$(SRC)/insert_diffobj_dvopsps_catalog.$(ARCH).o \ $(SRC)/insert_detections_dvopsps.$(ARCH).o \ $(SRC)/insert_detections_dvopsps_catalog.$(ARCH).o Index: /trunk/Ohana/src/dvopsps/include/dvopsps.h =================================================================== --- /trunk/Ohana/src/dvopsps/include/dvopsps.h (revision 37922) +++ /trunk/Ohana/src/dvopsps/include/dvopsps.h (revision 37923) @@ -121,4 +121,13 @@ int insert_skytable_mysql_init PROTO((IOBuffer *buffer)); +int insert_diffobj_dvopsps PROTO(()); +int insert_diffobj_dvopsps_parallel PROTO((SkyList *sky)); +int insert_diffobj_dvopsps_catalog PROTO((Catalog *catalog, char *basename, MYSQL *mysql)); + +int insert_diffobj_mysql_create_tables PROTO((char *basename, MYSQL *mysql)); +int insert_diffobj_mysql_init PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, char *basename)); +int insert_diffobj_mysql_value PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, Average *average, SecFilt *secfilt, int Nsecfilt)); +int insert_diffobj_mysql_commit PROTO((IOBuffer *ave_buffer, IOBuffer *sec_buffer, MYSQL *mysql)); + Detections *DetectionsLoad PROTO((char *filename, int *Ndetections)); int DetectionsSave PROTO((char *filename, Detections *detections, int Ndetections)); Index: /trunk/Ohana/src/dvopsps/src/dvopsps.c =================================================================== --- /trunk/Ohana/src/dvopsps/src/dvopsps.c (revision 37922) +++ /trunk/Ohana/src/dvopsps/src/dvopsps.c (revision 37923) @@ -14,4 +14,7 @@ if (!strcasecmp (argv[1], "objects")) { status = insert_objects_dvopsps (); + } + if (!strcasecmp (argv[1], "diffobj")) { + status = insert_diffobj_dvopsps (); } if (!strcasecmp (argv[1], "forced_warp_objects")) { Index: /trunk/Ohana/src/dvopsps/src/dvopsps_client.c =================================================================== --- /trunk/Ohana/src/dvopsps/src/dvopsps_client.c (revision 37922) +++ /trunk/Ohana/src/dvopsps/src/dvopsps_client.c (revision 37923) @@ -22,4 +22,7 @@ status = insert_objects_dvopsps (); } + if (!strcasecmp (argv[1], "diffobj")) { + status = insert_diffobj_dvopsps (); + } if (!strcasecmp (argv[1], "forced_warp_objects")) { status = insert_FWobjects_dvopsps (); Index: /trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c =================================================================== --- /trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c (revision 37922) +++ /trunk/Ohana/src/dvopsps/src/insert_FWobjects_dvopsps_catalog.c (revision 37923) @@ -6,4 +6,5 @@ off_t i; int missingID = 0; + int noLensobj = 0; IOBuffer ave_buffer, sec_buffer, cpy_buffer; @@ -42,4 +43,10 @@ off_t m = average[i].lensobjOffset; off_t Nlensobj = average[i].Nlensobj; + + // skip objects with no lensing object + if (!Nlensobj) { + noLensobj ++; + continue; + } // XXX check return status @@ -76,7 +83,9 @@ found ++; } - insert_FWobjects_mysql_commit (&ave_buffer, &sec_buffer, &cpy_buffer, mysql); - if (VERBOSE) fprintf (stderr, "inserted "OFF_T_FMT" average, "OFF_T_FMT" secfilt\n", - catalog[0].Naverage, Nsecfilt*catalog[0].Naverage); + if (Ninsert) { + insert_FWobjects_mysql_commit (&ave_buffer, &sec_buffer, &cpy_buffer, mysql); + } + if (VERBOSE) fprintf (stderr, "inserted "OFF_T_FMT" average, "OFF_T_FMT" secfilt, "OFF_T_FMT" lensobj\n", + catalog[0].Naverage, Nsecfilt*catalog[0].Naverage, catalog[0].Nlensobj); FreeIOBuffer (&ave_buffer); FreeIOBuffer (&sec_buffer); @@ -84,5 +93,5 @@ free (cleanname); - MARKTIME("-- inserted "OFF_T_FMT" objects in %f sec, skipped %d without IDs\n", found, dtime, missingID); + MARKTIME("-- inserted "OFF_T_FMT" objects in %f sec, skipped %d without IDs, %d with no lensobj\n", found, dtime, missingID, noLensobj); return (TRUE); } @@ -158,4 +167,6 @@ fprintf (stderr, "Nbuffer: %d\n", buffer.Nbuffer); } + buffer.Nbuffer = 0; + bzero (buffer.buffer, buffer.Nalloc); PrintIOBuffer (&buffer, "DROP TABLE %s_cpy\n", basename); @@ -173,38 +184,38 @@ "PHOTCODE SMALLINT, " - "FLUX_AP_R5, FLOAT, " - "FLUX_ERR_AP_R5, FLOAT, " - "FLUX_STD_AP_R5, FLOAT, " - "FLUX_FIL_AP_R5, FLOAT, " - "FLUX_AP_R6, FLOAT, " - "FLUX_ERR_AP_R6, FLOAT, " - "FLUX_STD_AP_R6, FLOAT, " - "FLUX_FIL_AP_R6, FLOAT, " - - "X11_SM_OBJ, FLOAT, " - "X12_SM_OBJ, FLOAT, " - "X22_SM_OBJ, FLOAT, " - "E1_SM_OBJ, FLOAT, " - "E2_SM_OBJ, FLOAT, " - "X11_SH_OBJ, FLOAT, " - "X12_SH_OBJ, FLOAT, " - "X22_SH_OBJ, FLOAT, " - "E1_SH_OBJ, FLOAT, " - "E2_SH_OBJ, FLOAT, " - - "X11_SM_PSF, FLOAT, " - "X12_SM_PSF, FLOAT, " - "X22_SM_PSF, FLOAT, " - "E1_SM_PSF, FLOAT, " - "E2_SM_PSF, FLOAT, " - "X11_SH_PSF, FLOAT, " - "X12_SH_PSF, FLOAT, " - "X22_SH_PSF, FLOAT, " - "E1_SH_PSF, FLOAT, " - "E2_SH_PSF, FLOAT, " - - "GAMMA, FLOAT, " - "E1, FLOAT, " - "E2, FLOAT, " + "FLUX_AP_R5 FLOAT, " + "FLUX_ERR_AP_R5 FLOAT, " + "FLUX_STD_AP_R5 FLOAT, " + "FLUX_FIL_AP_R5 FLOAT, " + "FLUX_AP_R6 FLOAT, " + "FLUX_ERR_AP_R6 FLOAT, " + "FLUX_STD_AP_R6 FLOAT, " + "FLUX_FIL_AP_R6 FLOAT, " + + "X11_SM_OBJ FLOAT, " + "X12_SM_OBJ FLOAT, " + "X22_SM_OBJ FLOAT, " + "E1_SM_OBJ FLOAT, " + "E2_SM_OBJ FLOAT, " + "X11_SH_OBJ FLOAT, " + "X12_SH_OBJ FLOAT, " + "X22_SH_OBJ FLOAT, " + "E1_SH_OBJ FLOAT, " + "E2_SH_OBJ FLOAT, " + + "X11_SM_PSF FLOAT, " + "X12_SM_PSF FLOAT, " + "X22_SM_PSF FLOAT, " + "E1_SM_PSF FLOAT, " + "E2_SM_PSF FLOAT, " + "X11_SH_PSF FLOAT, " + "X12_SH_PSF FLOAT, " + "X22_SH_PSF FLOAT, " + "E1_SH_PSF FLOAT, " + "E2_SH_PSF FLOAT, " + + "GAMMA FLOAT, " + "E1 FLOAT, " + "E2 FLOAT, " "NMEAS INT " Index: /trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps.c =================================================================== --- /trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps.c (revision 37923) +++ /trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps.c (revision 37923) @@ -0,0 +1,175 @@ +# include "dvopsps.h" +# define USE_MYSQL 1 + +// determine the relevant catalogs, launch parallel clients if desired +int insert_diffobj_dvopsps () { + + SkyTable *sky = NULL; + SkyList *skylist = NULL; + Catalog catalog; + off_t i; + + // load the current sky table (layout of all SkyRegions) + sky = SkyTableLoadOptimal (CATDIR, NULL, NULL, FALSE, -1, VERBOSE); + SkyTableSetFilenames (sky, CATDIR, "cpt"); + + // determine the populated SkyRegions overlapping the requested area (default depth) + if (SINGLE_CPT) { + skylist = SkyRegionByCPT (sky, SINGLE_CPT); + } else { + skylist = SkyListByPatch (sky, -1, &UserPatch); + } + myAssert (skylist, "ooops!"); + + // pass the skylist to the parallel version, and only launch on relevant hosts + if (PARALLEL && !HOST_ID) { + int status = insert_diffobj_dvopsps_parallel (skylist); + return status; + } + +# if (USE_MYSQL) + // NOTE: mysql connection happens here since each dvopsps_client makes its own connection + MYSQL mysqlBase; + MYSQL *mysqlReal = mysql_dvopsps_connect (&mysqlBase); + if (!mysqlReal) { + fprintf (stderr, "failed to connect to mysql\n"); + exit (1); + } +# else + MYSQL *mysqlReal = NULL; +# endif + + // select measurements for each populated catalog + for (i = 0; i < skylist[0].Nregions; i++) { + + // does this host ID match the desired location for the table? + if (!HostTableTestHost(skylist[0].regions[i], HOST_ID)) continue; + + char localFilename[1024]; + snprintf (localFilename, 1024, "%s/%s.cpt", HOSTDIR, skylist->regions[i]->name); + + // set up the basic catalog info + catalog.filename = HOST_ID ? localFilename : skylist[0].filename[i]; + catalog.catformat = DVO_FORMAT_UNDEF; // not needed since we skip empty catalogs + catalog.catmode = DVO_MODE_UNDEF; // not needed since we skip empty catalogs + catalog.catflags = LOAD_AVES | LOAD_SECF; + catalog.Nsecfilt = GetPhotcodeNsecfilt (); + + if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "r")) { + fprintf (stderr, "ERROR: failure reading catalog %s\n", catalog.filename); + exit (1); + } + if (!catalog.Naves_disk) { + if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename); + dvo_catalog_unlock (&catalog); + dvo_catalog_free (&catalog); + continue; + } + + // NOTE: this is where the real action happens + insert_diffobj_dvopsps_catalog (&catalog, skylist->regions[i]->name, mysqlReal); + + // NOTE : unlike setastrom or relphot, this program is read-only wrt dvo + dvo_catalog_unlock (&catalog); + dvo_catalog_free (&catalog); + } + + if (0) { + char query[256]; + MYSQL_RES *result; + + sprintf (query, "commit;"); + if (mysql_query (mysqlReal, query)) { + fprintf (stderr, "failed to turn off autocommit\n"); + fprintf (stderr, "%s\n", mysql_error (mysqlReal)); + return FALSE; + } + result = mysql_store_result (mysqlReal); + mysql_free_result (result); + } + + return (TRUE); +} + +# define DEBUG 1 + +int insert_diffobj_dvopsps_parallel (SkyList *sky) { + + // launch the dvopsps_client jobs to the parallel hosts + + // load the list of hosts + HostTable *table = HostTableLoad (CATDIR, sky->hosts); + + // if sky->Nregions < 0.5*Nhosts, check if the host used before launching... + + int i, j; + for (i = 0; i < table->Nhosts; i++) { + + if (sky->Nregions < table->Nhosts) { + // do any of the regions want this host? + int wantThisHost = FALSE; + for (j = 0; j < sky->Nregions; j++) { + if (HostTableTestHost (sky->regions[j], table->hosts[i].hostID)) { + wantThisHost = TRUE; + break; + } + } + if (!wantThisHost) { + // fprintf (stderr, "skip host %s\n", table->hosts[i].hostname); + continue; + } + } + + // ensure that the paths are absolute path names + char *tmppath = abspath (table->hosts[i].pathname, DVO_MAX_PATH); + free (table->hosts[i].pathname); + table->hosts[i].pathname = tmppath; + + char command[1024]; + snprintf (command, 1024, "dvopsps_client diffobj -hostID %d -catdir %s -hostdir %s -region %f %f %f %f", + table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, + UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax); + + char tmpline[1024]; + snprintf (tmpline, 1024, "%s -dbhost %s", command, DATABASE_HOST); strcpy (command, tmpline); + snprintf (tmpline, 1024, "%s -dbuser %s", command, DATABASE_USER); strcpy (command, tmpline); + snprintf (tmpline, 1024, "%s -dbpass %s", command, DATABASE_PASS); strcpy (command, tmpline); + snprintf (tmpline, 1024, "%s -dbname %s", command, DATABASE_NAME); strcpy (command, tmpline); + + if (VERBOSE) { snprintf (tmpline, 1024, "%s -v", command); strcpy (command, tmpline); } + if (SINGLE_CPT) { snprintf (tmpline, 1024, "%s -cpt %s", command, SINGLE_CPT); strcpy (command, tmpline); } + + fprintf (stderr, "command: %s\n", command); + + if (PARALLEL_MANUAL) continue; + + if (PARALLEL_SERIAL) { + int status = system (command); + if (status) { + fprintf (stderr, "ERROR running dvopsps_client\n"); + exit (2); + } + } else { + // launch the job on the remote machine (no handshake) + int errorInfo = 0; + int pid = rconnect ("ssh", table->hosts[i].hostname, command, table->hosts[i].stdio, &errorInfo, FALSE); + if (!pid) { + if (DEBUG) fprintf (stderr, "failure to start %s (error %d)\n", table->hosts[i].hostname, errorInfo); + exit (1); + } + table->hosts[i].pid = pid; // save for future reference + } + } + + // wait for the remote jobs to be completed + if (PARALLEL_MANUAL) { + fprintf (stderr, "run the dvopsps_client commands above. when these are done, hit return\n"); + getchar(); + } + if (!PARALLEL_MANUAL && !PARALLEL_SERIAL) { + int status = HostTableWaitJobsGetIO (table, __FILE__, __LINE__, VERBOSE); + if (!status) return FALSE; + } + + return (TRUE); +} Index: /trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c =================================================================== --- /trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c (revision 37923) +++ /trunk/Ohana/src/dvopsps/src/insert_diffobj_dvopsps_catalog.c (revision 37923) @@ -0,0 +1,324 @@ +# include "dvopsps.h" +# define DEBUG 0 + +int insert_diffobj_dvopsps_catalog (Catalog *catalog, char *basename, MYSQL *mysql) { + + off_t i; + int missingID = 0; + + IOBuffer ave_buffer, sec_buffer; + ave_buffer.Nalloc = 0; + sec_buffer.Nalloc = 0; + + Average *average = catalog->average; + SecFilt *secfilt = catalog->secfilt; + int Nsecfilt = catalog->Nsecfilt; + + off_t found = 0; + + char *cleanname = strcreate (basename); + for (i = 0; i < strlen(cleanname); i++) { + if (cleanname[i] == '.') cleanname[i] = '_'; + if (cleanname[i] == '/') cleanname[i] = '_'; + } + insert_diffobj_mysql_create_tables (cleanname, mysql); + + INITTIME; + insert_diffobj_mysql_init (&ave_buffer, &sec_buffer, cleanname); + int Ninsert = 0; + + // NOTE for testing, just do a few objects + if (!mysql) { + catalog[0].Naverage = 5; + } + for (i = 0; i < catalog[0].Naverage; i++) { + + if (average[i].extID == 0) { + missingID ++; + } + + // XXX check return status + insert_diffobj_mysql_value (&ave_buffer, &sec_buffer, &average[i], &secfilt[i*Nsecfilt], Nsecfilt); + + // fprintf (stderr, "%f : %d %d %d\n", average[i].ChiSqPM, isinf(average[i].ChiSqPM), isnan(average[i].ChiSqPM), isfinite(average[i].ChiSqPM)); + + // Average is a bigger table, but Nsecfilt*secfilt might be bigger, so check both + if ((ave_buffer.Nbuffer > MAX_BUFFER) || (sec_buffer.Nbuffer > MAX_BUFFER)) { + insert_diffobj_mysql_commit (&ave_buffer, &sec_buffer, mysql); + if (DEBUG) fprintf (stderr, "inserted %d rows\n", Ninsert); + Ninsert = 0; + if (0) { + FlushIOBuffer (&ave_buffer); + FlushIOBuffer (&sec_buffer); + } else { + ave_buffer.Nbuffer = 0; + bzero (ave_buffer.buffer, ave_buffer.Nalloc); + sec_buffer.Nbuffer = 0; + bzero (sec_buffer.buffer, sec_buffer.Nalloc); + } + insert_diffobj_mysql_init (&ave_buffer, &sec_buffer, cleanname); + } + Ninsert ++; + found ++; + } + insert_diffobj_mysql_commit (&ave_buffer, &sec_buffer, mysql); + if (VERBOSE) fprintf (stderr, "inserted "OFF_T_FMT" average, "OFF_T_FMT" secfilt\n", catalog[0].Naverage, Nsecfilt*catalog[0].Naverage); + FreeIOBuffer (&ave_buffer); + FreeIOBuffer (&sec_buffer); + free (cleanname); + + MARKTIME("-- inserted "OFF_T_FMT" diffobj in %f sec, skipped %d without IDs\n", found, dtime, missingID); + return (TRUE); +} + +int insert_diffobj_mysql_create_tables (char *basename, MYSQL *mysql) { + + int status; + IOBuffer buffer; + InitIOBuffer (&buffer, 1024); + // MYSQL_RES *result; + + PrintIOBuffer (&buffer, "DROP TABLE %s_cpt\n", basename); + status = mysql_query(mysql, buffer.buffer); + if (status) { + fprintf (stderr, "failed to drop table:\n"); + fprintf (stderr, "%s\n", mysql_error(mysql)); + } + buffer.Nbuffer = 0; + bzero (buffer.buffer, buffer.Nalloc); + + // Only send the necessary fields (eg, do not sent parallax and pm) + PrintIOBuffer (&buffer, "CREATE TABLE %s_cpt (" + "EXT_ID BIGINT, " + "OBJ_ID INT, " + "CAT_ID INT, " + "RA_MEAN DOUBLE, " + "DEC_MEAN DOUBLE, " + "RA_ERR FLOAT, " + "DEC_ERR FLOAT, " + "FLAGS INT " + ")\n", basename); + + if (DEBUG) fprintf (stderr, "%s\n", buffer.buffer); + status = mysql_query(mysql, buffer.buffer); + if (status) { + fprintf (stderr, "failed to create table:\n"); + fprintf (stderr, "%s\n", mysql_error(mysql)); + fprintf (stderr, "Nbuffer: %d\n", buffer.Nbuffer); + } + buffer.Nbuffer = 0; + bzero (buffer.buffer, buffer.Nalloc); + + PrintIOBuffer (&buffer, "DROP TABLE %s_cps\n", basename); + status = mysql_query(mysql, buffer.buffer); + if (status) { + fprintf (stderr, "failed to drop table:\n"); + fprintf (stderr, "%s\n", mysql_error(mysql)); + } + buffer.Nbuffer = 0; + bzero (buffer.buffer, buffer.Nalloc); + + PrintIOBuffer (&buffer, "CREATE TABLE %s_cps (" + "NWARP SMALLINT, " + "NUSED_WRP SMALLINT, " + "NUSED_KRON_WRP SMALLINT, " + "NUSED_AP_WRP SMALLINT, " + + "FLUX_PSF_WRP FLOAT, " + "FLUX_PSF_WRP_ERR FLOAT, " + "FLUX_PSF_WRP_STDEV FLOAT, " + + "FLUX_KRON_WRP FLOAT, " + "FLUX_KRON_WRP_ERR FLOAT, " + "FLUX_KRON_WRP_STDEV FLOAT, " + + "FLUX_AP_WRP FLOAT, " + "FLUX_AP_WRP_ERR FLOAT, " + "FLUX_AP_WRP_STDEV FLOAT, " + + "FLAGS INT " + ")\n", basename); + + if (DEBUG) fprintf (stderr, "%s\n", buffer.buffer); + status = mysql_query(mysql, buffer.buffer); + if (status) { + fprintf (stderr, "failed to create table:\n"); + fprintf (stderr, "%s\n", mysql_error(mysql)); + fprintf (stderr, "Nbuffer: %d\n", buffer.Nbuffer); + } + // result = mysql_store_result (mysql); + // mysql_free_result (result); + + FreeIOBuffer (&buffer); + return TRUE; +} + +int insert_diffobj_mysql_init (IOBuffer *ave_buffer, IOBuffer *sec_buffer, char *basename) { + + if (ave_buffer->Nalloc == 0) { + InitIOBuffer (ave_buffer, 1024); + } + PrintIOBuffer (ave_buffer, "INSERT INTO %s_cpt (" + "EXT_ID, " + "OBJ_ID, " + "CAT_ID, " + "RA_MEAN, " + "DEC_MEAN, " + "RA_ERR, " + "DEC_ERR, " + "FLAGS " + ") VALUES \n", basename); + + if (sec_buffer->Nalloc == 0) { + InitIOBuffer (sec_buffer, 1024); + } + PrintIOBuffer (sec_buffer, "INSERT INTO %s_cps (" + "NWARP, " + "NUSED_WRP, " + "NUSED_KRON_WRP, " + "NUSED_AP_WRP, " + + "FLUX_PSF_WRP, " + "FLUX_PSF_WRP_ERR, " + "FLUX_PSF_WRP_STDEV, " + + "FLUX_KRON_WRP, " + "FLUX_KRON_WRP_ERR, " + "FLUX_KRON_WRP_STDEV, " + + "FLUX_AP_WRP, " + "FLUX_AP_WRP_ERR, " + "FLUX_AP_WRP_STDEV, " + + "FLAGS" + ") VALUES \n", basename); + + return TRUE; +} + +# define PRINT_FLOAT(BUFFER,FIELD,FORMAT) \ + if (isinf(FIELD) || isnan(FIELD)) PrintIOBuffer (BUFFER, "NULL, "); \ + else PrintIOBuffer (BUFFER, FORMAT, FIELD); + +int insert_diffobj_mysql_value (IOBuffer *ave_buffer, IOBuffer *sec_buffer, Average *average, SecFilt *secfilt, int Nsecfilt) { + + int i; + +// XXX this bit could/should be autocoded... + PrintIOBuffer (ave_buffer, " ("); + PrintIOBuffer (ave_buffer, OFF_T_FMT", ", average->extID); + PrintIOBuffer (ave_buffer, "%u, ", average->objID); + PrintIOBuffer (ave_buffer, "%u, ", average->catID); + + 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 + + PrintIOBuffer (ave_buffer, "%u ", average->flags); + PrintIOBuffer (ave_buffer, "),\n"); + + // 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; + if (isfinite(secfilt->dFpsfWrp) && isfinite(secfilt->FpsfWrp)) { + meanPSFFlux = secfilt-> FpsfWrp; + meanPSFFluxErr = secfilt->dFpsfWrp; + meanPSFFluxStd = secfilt->sFpsfWrp; + } + + float meanKronFlux = -999.0; + float meanKronFluxErr = -999.0; + float meanKronFluxStd = -999.0; + if (isfinite(secfilt->dFkronWrp) && isfinite(secfilt->FkronWrp)) { + meanKronFlux = secfilt-> FkronWrp; + meanKronFluxErr = secfilt->dFkronWrp; + meanKronFluxStd = secfilt->sFkronWrp; + } + + float meanApFlux = -999.0; + float meanApFluxErr = -999.0; + float meanApFluxStd = -999.0; + if (isfinite(secfilt->dFapWrp) && isfinite(secfilt->FapWrp)) { + meanApFlux = secfilt-> FapWrp; + meanApFluxErr = secfilt->dFapWrp; + meanApFluxStd = secfilt->sFapWrp; + } + + PrintIOBuffer (sec_buffer, " ("); + PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Nwarp); + PrintIOBuffer (sec_buffer, "%hd, ", secfilt->NusedWrp); + PrintIOBuffer (sec_buffer, "%hd, ", secfilt->NusedKronWrp); + PrintIOBuffer (sec_buffer, "%hd, ", secfilt->NusedApWrp); + + // use %e? + PRINT_FLOAT(sec_buffer, meanPSFFlux, "%.6f, "); // uflux precision + PRINT_FLOAT(sec_buffer, meanPSFFluxErr, "%.6f, "); // uflux precision + PRINT_FLOAT(sec_buffer, meanPSFFluxStd, "%.6f, "); // uflux precision + + PRINT_FLOAT(sec_buffer, meanKronFlux, "%.6f, "); // uflux precision + PRINT_FLOAT(sec_buffer, meanKronFluxErr, "%.6f, "); // uflux precision + PRINT_FLOAT(sec_buffer, meanKronFluxStd, "%.6f, "); // uflux precision + + PRINT_FLOAT(sec_buffer, meanApFlux, "%.6f, "); // uflux precision + PRINT_FLOAT(sec_buffer, meanApFluxErr, "%.6f, "); // uflux precision + PRINT_FLOAT(sec_buffer, meanApFluxStd, "%.6f, "); // uflux precision + + PrintIOBuffer (sec_buffer, "%u ", secfilt->flags); + PrintIOBuffer (sec_buffer, "),\n"); + secfilt ++; + } + + return TRUE; +} + +int insert_diffobj_mysql_commit (IOBuffer *ave_buffer, IOBuffer *sec_buffer, MYSQL *mysql) { + + MYSQL_RES *result; + + // check that the last two chars are ,\n and replace with ;\n + if (!strcmp(&ave_buffer->buffer[ave_buffer->Nbuffer-2], ",\n")) { + ave_buffer->buffer[ave_buffer->Nbuffer-2] = ';'; + } else { + fprintf (stderr, "invalid sql?\n"); + return FALSE; + } + + // check that the last two chars are ,\n and replace with ;\n + if (!strcmp(&sec_buffer->buffer[sec_buffer->Nbuffer-2], ",\n")) { + sec_buffer->buffer[sec_buffer->Nbuffer-2] = ';'; + } else { + fprintf (stderr, "invalid sql?\n"); + return FALSE; + } + + // XXX check return status + if (mysql) { + int status; + if (DEBUG) fprintf (stderr, "%s\n", ave_buffer->buffer); + status = mysql_query(mysql, ave_buffer->buffer); + if (status) { + fprintf (stderr, "error with insert:\n"); + fprintf (stderr, "%s\n", mysql_error(mysql)); + fprintf (stderr, "Nbuffer: %d\n", ave_buffer->Nbuffer); + } + result = mysql_store_result (mysql); + if (result) mysql_free_result (result); + + if (DEBUG) fprintf (stderr, "%s\n", sec_buffer->buffer); + status = mysql_query(mysql, sec_buffer->buffer); + if (status) { + fprintf (stderr, "error with insert:\n"); + fprintf (stderr, "%s\n", mysql_error(mysql)); + fprintf (stderr, "Nbuffer: %d\n", sec_buffer->Nbuffer); + } + result = mysql_store_result (mysql); + if (result) mysql_free_result (result); + } else { + fprintf (stderr, "%s\n", sec_buffer->buffer); + } + + return TRUE; +}