IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 35206


Ignore:
Timestamp:
Feb 27, 2013, 11:49:41 AM (13 years ago)
Author:
eugene
Message:

add option to insert detections for a single client; fix isinf problem

Location:
trunk/Ohana/src/dvopsps
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/dvopsps/include/dvopsps.h

    r35098 r35206  
    55
    66# define DVO_MAX_PATH 1024
    7 # define MAX_BUFFER 0x080000
     7# define MAX_BUFFER 0x0800
    88
    99typedef struct {
    … …  
    3131char        *HOSTDIR;
    3232int          VERBOSE;
     33
     34int          SAVE_REMOTE;
    3335
    3436int          PARALLEL;

  • trunk/Ohana/src/dvopsps/src/initialize_dvopsps.c

    r35098 r35206  
    104104  if ((N = get_argument (argc, argv, "-v"))) {
    105105    VERBOSE = TRUE;
     106    remove_argument (N, &argc, argv);
     107  }
     108
     109  SAVE_REMOTE = TRUE;
     110  if ((N = get_argument (argc, argv, "-insert-remote"))) {
     111    SAVE_REMOTE = FALSE;
    106112    remove_argument (N, &argc, argv);
    107113  }
    … …  
    260266  }
    261267
     268  SAVE_REMOTE = TRUE;
     269  if ((N = get_argument (argc, argv, "-insert-remote"))) {
     270    SAVE_REMOTE = FALSE;
     271    remove_argument (N, &argc, argv);
     272  }
     273
    262274  HOST_ID = 0;
    263275  if ((N = get_argument (argc, argv, "-hostID"))) {

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

    r35176 r35206  
    11# include "dvopsps.h"
    22# define USE_MYSQL 1
    3 # define SAVE_REMOTE 1
     3// # define SAVE_REMOTE 1
    44
    55# define MARKTIME(MSG,...) {                    \
    … …  
    237237}
    238238
     239# define PRINT_FLOAT(BUFFER,FIELD,FORMAT)                 \
     240  if (!isfinite(FIELD)) PrintIOBuffer (BUFFER, "NULL, "); \
     241  else PrintIOBuffer (BUFFER, FORMAT, FIELD);
     242
    239243int insert_detections_mysql_detvalue (IOBuffer *buffer, Detections *detection) {
    240244
    … …  
    245249  PrintIOBuffer (buffer, "%lu, ", detection->objID);      // objID
    246250  PrintIOBuffer (buffer, "%u, ", detection->flags);       // flags
    247   if (isnan(detection->zp))      PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->zp);   // zp
    248   if (isnan(detection->zpErr))   PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->zpErr);        // zpErr
    249   if (isnan(detection->airMass)) PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->airMass);      //
    250   if (isnan(detection->expTime)) PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->expTime);      // expTime
    251   if (isnan(detection->ra))      PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%lf, ", detection->ra);   // ra
    252   if (isnan(detection->dec))     PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%lf, ", detection->dec);          // dec
    253   if (isnan(detection->raErr))   PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->raErr);        // estimate of raErr
    254   if (isnan(detection->decErr))  PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f),\n",  detection->decErr);     // estimate of decErr
     251  PRINT_FLOAT(buffer, detection->zp, "%f, ");
     252  PRINT_FLOAT(buffer, detection->zpErr, "%f, ");
     253  PRINT_FLOAT(buffer, detection->airMass, "%f, ");
     254  PRINT_FLOAT(buffer, detection->expTime, "%f, ");
     255  PRINT_FLOAT(buffer, detection->ra, "%lf, ");
     256  PRINT_FLOAT(buffer, detection->dec, "%lf, ");
     257  PRINT_FLOAT(buffer, detection->raErr, "%f, ");
     258  PRINT_FLOAT(buffer, detection->decErr, "%f),\n");
    255259  return TRUE;
    256260}

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

    r35098 r35206  
    153153}
    154154
     155# define PRINT_FLOAT(BUFFER,FIELD,FORMAT)                 \
     156  if (isinf(FIELD) || isnan(FIELD)) PrintIOBuffer (BUFFER, "NULL, ");   \
     157  else PrintIOBuffer (BUFFER, FORMAT, FIELD);
     158
    155159int insert_detections_mysql_value (IOBuffer *buffer, Average *average, Measure *measure) {
    156160
    157161  // XXX I am changing the def of ippObjID if I use the code below
    158162  PhotCode *code = GetPhotcodebyCode(measure->photcode);
    159   PrintIOBuffer (buffer, "    (%d, %u, %lu, %lu, %lu, %u, %f, %f, %f, %f, %lf, %lf, %f, %f),\n",
    160                  measure->imageID,    // imageID
    161                  measure->detID,   // ippDetectID
    162                  measure->extID,   // detectID
    163                  ((uint64_t)average->catID * 1000000000) + (uint64_t)average->objID, // ippObjID
    164 // NOTE: this is better, but the above is the current ippToPsps value
    165 //                              ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
    166                  average->extID,   // objID
    167                  measure->dbFlags,  // flags
    168                  code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal,   // zp
    169                  measure->dMcal,    // zpErr
    170                  measure->airmass,
    171                  pow(10.0, 0.4 * measure->dt),    // expTime
    172                  average->R - measure->dR / 3600.,    // ra
    173                  average->D - measure->dR / 3600.,    // dec
    174                  measure->dXccd * 0.01 * fabs(measure->pltscale), // estimate of raErr
    175                  measure->dYccd * 0.01 * fabs(measure->pltscale) // estimate of decErr
    176     );
     163  // PrintIOBuffer (buffer, "    (%d, %u, %lu, %lu, %lu, %u, %f, %f, %f, %f, %lf, %lf, %f, %f),\n",
     164  //             measure->imageID,    // imageID
     165  //             measure->detID,   // ippDetectID
     166  //             measure->extID,   // detectID
     167  //             ((uint64_t)average->catID * 1000000000) + (uint64_t)average->objID, // ippObjID
     168  //             // NOTE: this is better, but the above is the current ippToPsps value
     169  //             // ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
     170  //             average->extID,   // objID
     171  //             measure->dbFlags,  // flags
     172  //             code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal,   // zp
     173  //             measure->dMcal,    // zpErr
     174  //             measure->airmass,
     175  //             pow(10.0, 0.4 * measure->dt),    // expTime
     176  //             average->R - measure->dR / 3600.,    // ra
     177  //             average->D - measure->dR / 3600.,    // dec
     178  //             measure->dXccd * 0.01 * fabs(measure->pltscale), // estimate of raErr
     179  //             measure->dYccd * 0.01 * fabs(measure->pltscale) // estimate of decErr
     180  //   );
     181 
     182  PrintIOBuffer (buffer, "(%d, ", measure->imageID);      // imageID
     183  PrintIOBuffer (buffer, "%u, ", measure->detID); // ippDetectID
     184  PrintIOBuffer (buffer, "%lu, ", measure->extID);        // detectID
     185  PrintIOBuffer (buffer, "%lu, ", ((uint64_t)average->catID * 1000000000) + (uint64_t)average->objID);    // ippObjID
     186  // NOTE: the following is better, but the above is the current ippToPsps value
     187  // ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
     188  PrintIOBuffer (buffer, "%lu, ", average->extID);        // objID
     189  PrintIOBuffer (buffer, "%u, ", measure->dbFlags);       // flags
     190  PRINT_FLOAT(buffer, code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal, "%f, ");
     191  PRINT_FLOAT(buffer, measure->dMcal, "%f, ");
     192  PRINT_FLOAT(buffer, measure->airmass, "%f, ");
     193  PRINT_FLOAT(buffer, pow(10.0, 0.4 * measure->dt), "%f, ");
     194  PRINT_FLOAT(buffer, average->R - measure->dR / 3600., "%lf, ");
     195  PRINT_FLOAT(buffer, average->D - measure->dD / 3600., "%lf, ");
     196  PRINT_FLOAT(buffer, measure->dXccd * 0.01 * fabs(measure->pltscale), "%f, ");
     197  PRINT_FLOAT(buffer, measure->dYccd * 0.01 * fabs(measure->pltscale), "%f),\n");
     198 
    177199  return TRUE;
    178200}

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

    r35098 r35206  
    4747    // XXX check return status
    4848    insert_objects_mysql_value (&ave_buffer, &sec_buffer, &average[i], &secfilt[i*Nsecfilt], Nsecfilt);
     49
     50    // fprintf (stderr, "%f : %d %d %d\n", average[i].ChiSqPM, isinf(average[i].ChiSqPM), isnan(average[i].ChiSqPM), isfinite(average[i].ChiSqPM));
    4951
    5052    // Average is a bigger table, but Nsecfilt*secfilt might be bigger, so check both
    … …  
    251253}
    252254
     255# define PRINT_FLOAT(BUFFER,FIELD,FORMAT)                 \
     256  if (isinf(FIELD) || isnan(FIELD)) PrintIOBuffer (BUFFER, "NULL, ");   \
     257  else PrintIOBuffer (BUFFER, FORMAT, FIELD);
     258
    253259int insert_objects_mysql_value (IOBuffer *ave_buffer, IOBuffer *sec_buffer, Average *average, SecFilt *secfilt, int Nsecfilt) {
    254260
    … …  
    257263// XXX this bit could/should be autocoded...
    258264  PrintIOBuffer (ave_buffer, " (");
    259   if (isnan(average->R))              PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%lf, ", average->R);             
    260   if (isnan(average->D))              PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%lf, ", average->D);               
    261   if (isnan(average->dR))             PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->dR);             
    262   if (isnan(average->dD))             PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->dD);             
    263   if (isnan(average->uR))             PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->uR);             
    264   if (isnan(average->uD))             PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->uD);             
    265   if (isnan(average->duR))            PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->duR);           
    266   if (isnan(average->duD))            PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->duD);           
    267   if (isnan(average->P))              PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->P);             
    268   if (isnan(average->dP))             PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->dP);             
    269   if (isnan(average->ChiSqAve))       PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->ChiSqAve);       
    270   if (isnan(average->ChiSqPM))        PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->ChiSqPM);       
    271   if (isnan(average->ChiSqPar))       PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->ChiSqPar);       
     265  PRINT_FLOAT(ave_buffer, average->R, "%lf, ");
     266  PRINT_FLOAT(ave_buffer, average->D, "%lf, ");
     267  PRINT_FLOAT(ave_buffer, average->dR, "%f, ");
     268  PRINT_FLOAT(ave_buffer, average->dD, "%f, ");
     269  PRINT_FLOAT(ave_buffer, average->uR, "%f, ");
     270  PRINT_FLOAT(ave_buffer, average->uD, "%f, ");
     271  PRINT_FLOAT(ave_buffer, average->duR, "%f, ");
     272  PRINT_FLOAT(ave_buffer, average->duD, "%f, ");
     273  PRINT_FLOAT(ave_buffer, average->P, "%f, ");
     274  PRINT_FLOAT(ave_buffer, average->dP, "%f, ");
     275  PRINT_FLOAT(ave_buffer, average->ChiSqAve, "%f, ");
     276  PRINT_FLOAT(ave_buffer, average->ChiSqPM, "%f, ");
     277  PRINT_FLOAT(ave_buffer, average->ChiSqPar, "%f, ");
    272278  PrintIOBuffer (ave_buffer, "%d, ",  average->Tmean);         
    273279  PrintIOBuffer (ave_buffer, "%d, ",  average->Trange);         
    274   if (isnan(average->psfQF))          PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->psfQF);         
    275   if (isnan(average->psfQFperf))      PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->psfQFperf);     
    276   if (isnan(average->stargal))        PrintIOBuffer (ave_buffer, "NULL, "); else PrintIOBuffer (ave_buffer, "%f, ",  average->stargal);       
     280  PRINT_FLOAT(ave_buffer, average->psfQF, "%f, ");
     281  PRINT_FLOAT(ave_buffer, average->psfQFperf, "%f, ");
     282  PRINT_FLOAT(ave_buffer, average->stargal, "%f, ");
    277283  PrintIOBuffer (ave_buffer, "%hu, ", average->Npos);           
    278284  PrintIOBuffer (ave_buffer, "%hu, ", average->Nmeasure);       
    … …  
    293299  for (i = 0; i < Nsecfilt; i++) {
    294300    PrintIOBuffer (sec_buffer, " (");
    295     if (isnan(secfilt->M))         PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->M);           
    296     if (isnan(secfilt->Map))       PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->Map);         
    297     if (isnan(secfilt->Mkron))     PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->Mkron);       
    298     if (isnan(secfilt->dMkron))    PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->dMkron);     
    299     if (isnan(secfilt->dM))        PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->dM);         
    300     if (isnan(secfilt->Xm))        PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->Xm);         
    301     if (isnan(secfilt->FluxPSF))   PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->FluxPSF);     
    302     if (isnan(secfilt->dFluxPSF))  PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->dFluxPSF);   
    303     if (isnan(secfilt->FluxKron))  PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->FluxKron);   
    304     if (isnan(secfilt->dFluxKron)) PrintIOBuffer (sec_buffer, "NULL, "); else PrintIOBuffer (sec_buffer, "%f, ", secfilt->dFluxKron);   
     301    PRINT_FLOAT(sec_buffer, secfilt->M, "%f, ");
     302    PRINT_FLOAT(sec_buffer, secfilt->Map, "%f, ");
     303    PRINT_FLOAT(sec_buffer, secfilt->Mkron, "%f, ");
     304    PRINT_FLOAT(sec_buffer, secfilt->dMkron, "%f, ");
     305    PRINT_FLOAT(sec_buffer, secfilt->dM, "%f, ");
     306    PRINT_FLOAT(sec_buffer, secfilt->Xm, "%f, ");
     307    PRINT_FLOAT(sec_buffer, secfilt->FluxPSF, "%f, ");
     308    PRINT_FLOAT(sec_buffer, secfilt->dFluxPSF, "%f, ");
     309    PRINT_FLOAT(sec_buffer, secfilt->FluxKron, "%f, ");
     310    PRINT_FLOAT(sec_buffer, secfilt->dFluxKron, "%f, ");
    305311    PrintIOBuffer (sec_buffer, "%u,  ", secfilt->flags);       
    306312    PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Ncode);       
Note: See TracChangeset for help on using the changeset viewer.