IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 35234


Ignore:
Timestamp:
Mar 5, 2013, 2:22:28 PM (13 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20130207/Ohana
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20130207/Ohana

  • branches/eam_branches/ipp-20130207/Ohana/src/addstar/src/resort_unthreaded.c

    r33963 r35234  
    4040  }
    4141
    42   resort_unthreaded_catalogs (options, skylist, 0, NULL);
     42  resort_unthreaded_catalogs (options, skylist, hostID, hostpath);
    4343
    4444  gettimeofday (&stop, NULL);

  • branches/eam_branches/ipp-20130207/Ohana/src/dvopsps/include/dvopsps.h

    r35098 r35234  
    3131char        *HOSTDIR;
    3232int          VERBOSE;
     33
     34int          SAVE_REMOTE;
    3335
    3436int          PARALLEL;

  • branches/eam_branches/ipp-20130207/Ohana/src/dvopsps/src/initialize_dvopsps.c

    r35098 r35234  
    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"))) {

  • branches/eam_branches/ipp-20130207/Ohana/src/dvopsps/src/insert_detections_dvopsps.c

    r35098 r35234  
    11# include "dvopsps.h"
    22# define USE_MYSQL 1
    3 # define SAVE_REMOTE 1
     3// # define SAVE_REMOTE 1
    44
    55# define MARKTIME(MSG,...) {                    \
    … …  
    110110  HostTable *table = HostTableLoad (CATDIR, sky->hosts);
    111111
     112  char uniquer[12];
     113  int TIME = time(NULL);
     114  int PID = getpid();
     115  snprintf (uniquer, 12, "%05d.%05d", PID, TIME % 100000);
     116
    112117  int i;
    113118  for (i = 0; i < table->Nhosts; i++) {
    … …  
    121126      // XXX need to uniquify the result file
    122127      ALLOCATE (table->hosts[i].results, char, 1024);
    123       snprintf (table->hosts[i].results, 1024, "%s/dvopsps_detections.dat", table->hosts[i].pathname);
     128      snprintf (table->hosts[i].results, 1024, "%s/dvopsps.%s.det.dat", table->hosts[i].pathname, uniquer);
    124129    }
    125130
    … …  
    232237}
    233238
     239# define PRINT_FLOAT(BUFFER,FIELD,FORMAT)                 \
     240  if (!isfinite(FIELD)) PrintIOBuffer (BUFFER, "NULL, "); \
     241  else PrintIOBuffer (BUFFER, FORMAT, FIELD);
     242
    234243int insert_detections_mysql_detvalue (IOBuffer *buffer, Detections *detection) {
    235244
    … …  
    240249  PrintIOBuffer (buffer, "%lu, ", detection->objID);      // objID
    241250  PrintIOBuffer (buffer, "%u, ", detection->flags);       // flags
    242   if (isnan(detection->zp))      PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->zp);   // zp
    243   if (isnan(detection->zpErr))   PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->zpErr);        // zpErr
    244   if (isnan(detection->airMass)) PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->airMass);      //
    245   if (isnan(detection->expTime)) PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->expTime);      // expTime
    246   if (isnan(detection->ra))      PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%lf, ", detection->ra);   // ra
    247   if (isnan(detection->dec))     PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%lf, ", detection->dec);          // dec
    248   if (isnan(detection->raErr))   PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f, ",  detection->raErr);        // estimate of raErr
    249   if (isnan(detection->decErr))  PrintIOBuffer (buffer, "NULL, "); else PrintIOBuffer (buffer, "%f),\n",  detection->decErr);     // estimate of decErr
     251  PRINT_FLOAT(buffer, detection->zp,      "%.6f, ");
     252  PRINT_FLOAT(buffer, detection->zpErr,   "%.6f, ");
     253  PRINT_FLOAT(buffer, detection->airMass, "%.6f, ");
     254  PRINT_FLOAT(buffer, detection->expTime, "%.6f, ");
     255  PRINT_FLOAT(buffer, detection->ra,      "%.8f, ");
     256  PRINT_FLOAT(buffer, detection->dec,     "%.8f, ");
     257  PRINT_FLOAT(buffer, detection->raErr,   "%.6f, ");
     258  PRINT_FLOAT(buffer, detection->decErr,  "%.6f),\n");
    250259  return TRUE;
    251260}

  • branches/eam_branches/ipp-20130207/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

    r35098 r35234  
    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  float zp = code->C * 0.001 + code->K * (measure->airmass - 1) - measure->Mcal;
     191  float exptime = pow(10.0, 0.4 * measure->dt);
     192  double ra  = average->R - measure->dR / 3600.0;
     193  double dec = average->D - measure->dD / 3600.0;
     194  double dR = measure->dXccd * 0.01 * fabs(measure->pltscale);
     195  double dD = measure->dYccd * 0.01 * fabs(measure->pltscale);
     196
     197  PRINT_FLOAT(buffer, zp,               "%.6f, ");
     198  PRINT_FLOAT(buffer, measure->dMcal,   "%.6f, ");
     199  PRINT_FLOAT(buffer, measure->airmass, "%.6f, ");
     200  PRINT_FLOAT(buffer, exptime,          "%.6f, ");
     201  PRINT_FLOAT(buffer, ra,               "%.8f, ");
     202  PRINT_FLOAT(buffer, dec,              "%.8f, ");
     203  PRINT_FLOAT(buffer, dR,               "%.6f, ");
     204  PRINT_FLOAT(buffer, dD,               "%.6f),\n");
     205 
    177206  return TRUE;
    178207}

  • branches/eam_branches/ipp-20130207/Ohana/src/dvopsps/src/insert_objects_dvopsps_catalog.c

    r35098 r35234  
    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,        "%.8f, ");  // 0.036 mas precision
     266  PRINT_FLOAT(ave_buffer, average->D,        "%.8f, ");  // 0.036 mas precision
     267  PRINT_FLOAT(ave_buffer, average->dR,       "%.5f, ");  // 0.010 mas precision
     268  PRINT_FLOAT(ave_buffer, average->dD,       "%.5f, ");  // 0.010 mas precision
     269  PRINT_FLOAT(ave_buffer, average->uR,       "%.5f, ");  // 0.010 mas/yr precision
     270  PRINT_FLOAT(ave_buffer, average->uD,       "%.5f, ");
     271  PRINT_FLOAT(ave_buffer, average->duR,      "%.5f, ");
     272  PRINT_FLOAT(ave_buffer, average->duD,      "%.5f, ");
     273  PRINT_FLOAT(ave_buffer, average->P,        "%.5f, ");
     274  PRINT_FLOAT(ave_buffer, average->dP,       "%.5f, ");
     275  PRINT_FLOAT(ave_buffer, average->ChiSqAve, "%.4f, ");
     276  PRINT_FLOAT(ave_buffer, average->ChiSqPM,  "%.4f, ");
     277  PRINT_FLOAT(ave_buffer, average->ChiSqPar, "%.4f, ");
    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,     "%.3f, ");
     281  PRINT_FLOAT(ave_buffer, average->psfQFperf, "%.3f, ");
     282  PRINT_FLOAT(ave_buffer, average->stargal,   "%.3f, ");
    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,         "%.6f, "); // umag precision
     302    PRINT_FLOAT(sec_buffer, secfilt->Map,       "%.6f, "); // umag precision
     303    PRINT_FLOAT(sec_buffer, secfilt->Mkron,     "%.6f, "); // umag precision
     304    PRINT_FLOAT(sec_buffer, secfilt->dMkron,    "%.6f, "); // umag precision
     305    PRINT_FLOAT(sec_buffer, secfilt->dM,        "%.6f, "); // umag precision
     306    PRINT_FLOAT(sec_buffer, secfilt->Xm,        "%.6f, ");
     307    PRINT_FLOAT(sec_buffer, secfilt->FluxPSF,   "%.6e, "); // 0.36 umag precision
     308    PRINT_FLOAT(sec_buffer, secfilt->dFluxPSF,  "%.6e, "); // 0.36 umag precision
     309    PRINT_FLOAT(sec_buffer, secfilt->FluxKron,  "%.6e, "); // 0.36 umag precision
     310    PRINT_FLOAT(sec_buffer, secfilt->dFluxKron, "%.6e, "); // 0.36 umag precision
    305311    PrintIOBuffer (sec_buffer, "%u,  ", secfilt->flags);       
    306312    PrintIOBuffer (sec_buffer, "%hd, ", secfilt->Ncode);       

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/elixir_defs.h

    r27435 r35234  
    1 Image                   *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues);
     1Image                   *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues, off_t Nalloc);
    22Image_Elixir            *ImageInternalTo_Elixir (Image *in, off_t Nvalues);
    33Average                 *Average_Elixir_ToInternal (Average_Elixir *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/loneos_defs.h

    r27435 r35234  
    1 Image                   *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues);
     1Image                   *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues, off_t Nalloc);
    22Image_Loneos            *ImageInternalTo_Loneos (Image *in, off_t Nvalues);
    33Average                 *Average_Loneos_ToInternal (Average_Loneos *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/panstarrs_dev_0_defs.h

    r27435 r35234  
    1 Image                   *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, off_t Nvalues);
     1Image                   *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, off_t Nvalues, off_t Nalloc);
    22Image_Panstarrs_DEV_0   *ImageInternalTo_Panstarrs_DEV_0 (Image *in, off_t Nvalues);
    33Average                 *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/panstarrs_dev_1_defs.h

    r27435 r35234  
    1 Image                   *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, off_t Nvalues);
     1Image                   *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, off_t Nvalues, off_t Nalloc);
    22Image_Panstarrs_DEV_1   *ImageInternalTo_Panstarrs_DEV_1 (Image *in, off_t Nvalues);
    33Average                 *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/ps1_dev_1_defs.h

    r27435 r35234  
    1 Image                   *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, off_t Nvalues);
     1Image                   *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, off_t Nvalues, off_t Nalloc);
    22Image_PS1_DEV_1         *ImageInternalTo_PS1_DEV_1 (Image *in, off_t Nvalues);
    33Average                 *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/ps1_dev_2_defs.h

    r27435 r35234  
    1 Image                   *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, off_t Nvalues);
     1Image                   *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, off_t Nvalues, off_t Nalloc);
    22Image_PS1_DEV_2         *ImageInternalTo_PS1_DEV_2 (Image *in, off_t Nvalues);
    33Average                 *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/ps1_dev_3_defs.h

    r27435 r35234  
    1 Image                   *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, off_t Nvalues);
     1Image                   *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, off_t Nvalues, off_t Nalloc);
    22Image_PS1_DEV_3         *ImageInternalTo_PS1_DEV_3 (Image *in, off_t Nvalues);
    33

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/ps1_ref_defs.h

    r27435 r35234  
    1 Image                   *Image_PS1_REF_ToInternal (Image_PS1_REF *in, off_t Nvalues);
     1Image                   *Image_PS1_REF_ToInternal (Image_PS1_REF *in, off_t Nvalues, off_t Nalloc);
    22Image_PS1_REF           *ImageInternalTo_PS1_REF (Image *in, off_t Nvalues);
    33Average                 *Average_PS1_REF_ToInternal (Average_PS1_REF *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/ps1_v1_defs.h

    r27435 r35234  
    1 Image                   *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, off_t Nvalues);
     1Image                   *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, off_t Nvalues, off_t Nalloc);
    22Image_PS1_V1            *ImageInternalTo_PS1_V1 (Image *in, off_t Nvalues);
    33Average                 *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/ps1_v2_defs.h

    r27585 r35234  
    1 Image                   *Image_PS1_V2_ToInternal (Image_PS1_V2 *in, off_t Nvalues);
     1Image                   *Image_PS1_V2_ToInternal (Image_PS1_V2 *in, off_t Nvalues, off_t Nalloc);
    22Image_PS1_V2            *ImageInternalTo_PS1_V2 (Image *in, off_t Nvalues);
    33Average                 *Average_PS1_V2_ToInternal (Average_PS1_V2 *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/ps1_v3_defs.h

    r33649 r35234  
    1 Image                   *Image_PS1_V3_ToInternal (Image_PS1_V3 *in, off_t Nvalues);
     1Image                   *Image_PS1_V3_ToInternal (Image_PS1_V3 *in, off_t Nvalues, off_t Nalloc);
    22Image_PS1_V3            *ImageInternalTo_PS1_V3 (Image *in, off_t Nvalues);
    33Average                 *Average_PS1_V3_ToInternal (Average_PS1_V3 *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/include/ps1_v4_defs.h

    r34260 r35234  
    1 Image                   *Image_PS1_V4_ToInternal (Image_PS1_V4 *in, off_t Nvalues);
     1Image                   *Image_PS1_V4_ToInternal (Image_PS1_V4 *in, off_t Nvalues, off_t Nalloc);
    22Image_PS1_V4            *ImageInternalTo_PS1_V4 (Image *in, off_t Nvalues);
    33Average                 *Average_PS1_V4_ToInternal (Average_PS1_V4 *in, off_t Nvalues, SecFilt **primary);

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert.c

    r34260 r35234  
    327327/*** Image Conversions ***/
    328328
     329// I have loaded the disk db table and now I want to convert to the internal format
     330// (Image structure), but I onyl
    329331int FtableToImage (FTable *ftable, Header *theader, char *format) {
    330332
    … …  
    340342      exit (2);
    341343    }
    342     ftable[0].buffer = (char *) Image_Elixir_ToInternal (tmpimage, Nimage);
     344    off_t Nalloc = gfits_data_pad_size(Nimage*sizeof(Image));
     345    ftable[0].buffer = (char *) Image_Elixir_ToInternal (tmpimage, Nimage, Nalloc);
    343346    free (tmpimage);
    344347    gfits_free_header (theader);
    … …  
    365368      exit (2); \
    366369    } \
    367     ftable[0].buffer = (char *) Image_##TYPE##_ToInternal (tmpimage, Nimage); \
     370    off_t Nalloc = gfits_data_pad_size(Nimage*sizeof(Image));           \
     371    ftable[0].buffer = (char *) Image_##TYPE##_ToInternal (tmpimage, Nimage, Nalloc); \
    368372    free (tmpimage); \
    369373    gfits_free_header (theader); \

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c

    r34749 r35234  
    204204}
    205205
    206 Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, off_t Nvalues) {
     206Image *Image_PS1_DEV_1_ToInternal (Image_PS1_DEV_1 *in, off_t Nvalues, off_t Nalloc) {
    207207
    208208  off_t i;
    209209  Image *out;
    210210
    211   ALLOCATE_ZERO (out, Image, Nvalues);
     211  char *buffer;
     212  ALLOCATE_ZERO (buffer, char, Nalloc);
     213  out = (Image *) buffer;
     214  // ALLOCATE_ZERO (out, Image, Nvalues);
    212215
    213216  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

    r34749 r35234  
    199199}
    200200
    201 Image *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, off_t Nvalues) {
     201Image *Image_PS1_DEV_2_ToInternal (Image_PS1_DEV_2 *in, off_t Nvalues, off_t Nalloc) {
    202202
    203203  off_t i;
    204204  Image *out;
    205205
    206   ALLOCATE_ZERO (out, Image, Nvalues);
     206  char *buffer;
     207  ALLOCATE_ZERO (buffer, char, Nalloc);
     208  out = (Image *) buffer;
     209  // ALLOCATE_ZERO (out, Image, Nvalues);
    207210
    208211  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_3.c

    r33649 r35234  
    55// We only provide image and photcode conversion
    66
    7 Image *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, off_t Nvalues) {
     7Image *Image_PS1_DEV_3_ToInternal (Image_PS1_DEV_3 *in, off_t Nvalues, off_t Nalloc) {
    88
    99  off_t i;
    1010  Image *out;
    1111
    12   ALLOCATE_ZERO (out, Image, Nvalues);
     12  char *buffer;
     13  ALLOCATE_ZERO (buffer, char, Nalloc);
     14  out = (Image *) buffer;
     15  // ALLOCATE_ZERO (out, Image, Nvalues);
    1316
    1417  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c

    r34749 r35234  
    129129}
    130130
    131 Image *Image_PS1_REF_ToInternal (Image_PS1_REF *in, off_t Nvalues) {
     131Image *Image_PS1_REF_ToInternal (Image_PS1_REF *in, off_t Nvalues, off_t Nalloc) {
    132132
    133133  off_t i;
    134134  Image *out;
    135135
    136   ALLOCATE_ZERO (out, Image, Nvalues);
     136  char *buffer;
     137  ALLOCATE_ZERO (buffer, char, Nalloc);
     138  out = (Image *) buffer;
     139  // ALLOCATE_ZERO (out, Image, Nvalues);
    137140
    138141  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c

    r34749 r35234  
    224224}
    225225
    226 Image *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, off_t Nvalues) {
     226Image *Image_PS1_V1_ToInternal (Image_PS1_V1 *in, off_t Nvalues, off_t Nalloc) {
    227227
    228228  off_t i;
    229229  Image *out;
    230230
    231   ALLOCATE_ZERO (out, Image, Nvalues);
     231  char *buffer;
     232  ALLOCATE_ZERO (buffer, char, Nalloc);
     233  out = (Image *) buffer;
     234  // ALLOCATE_ZERO (out, Image, Nvalues);
    232235
    233236  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c

    r34749 r35234  
    235235}
    236236
    237 Image *Image_PS1_V2_ToInternal (Image_PS1_V2 *in, off_t Nvalues) {
     237Image *Image_PS1_V2_ToInternal (Image_PS1_V2 *in, off_t Nvalues, off_t Nalloc) {
    238238
    239239  off_t i;
    240240  Image *out;
    241241
    242   ALLOCATE_ZERO (out, Image, Nvalues);
     242  char *buffer;
     243  ALLOCATE_ZERO (buffer, char, Nalloc);
     244  out = (Image *) buffer;
     245  // ALLOCATE_ZERO (out, Image, Nvalues);
    243246
    244247  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c

    r34749 r35234  
    245245}
    246246
    247 Image *Image_PS1_V3_ToInternal (Image_PS1_V3 *in, off_t Nvalues) {
     247Image *Image_PS1_V3_ToInternal (Image_PS1_V3 *in, off_t Nvalues, off_t Nalloc) {
    248248
    249249  off_t i;
    250250  Image *out;
    251251
    252   ALLOCATE_ZERO (out, Image, Nvalues);
     252  char *buffer;
     253  ALLOCATE_ZERO (buffer, char, Nalloc);
     254  out = (Image *) buffer;
     255  // ALLOCATE_ZERO (out, Image, Nvalues);
    253256
    254257  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c

    r35102 r35234  
    283283}
    284284
    285 Image *Image_PS1_V4_ToInternal (Image_PS1_V4 *in, off_t Nvalues) {
     285Image *Image_PS1_V4_ToInternal (Image_PS1_V4 *in, off_t Nvalues, off_t Nalloc) {
    286286
    287287  off_t i;
    288288  Image *out;
    289289
    290   ALLOCATE_ZERO (out, Image, Nvalues);
     290  char *buffer;
     291  ALLOCATE_ZERO (buffer, char, Nalloc);
     292  out = (Image *) buffer;
     293  // ALLOCATE_ZERO (out, Image, Nvalues);
    291294
    292295  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_elixir.c

    r34749 r35234  
    190190
    191191/* convert elixir-format images to internal images */
    192 Image *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues) {
     192Image *Image_Elixir_ToInternal (Image_Elixir *in, off_t Nvalues, off_t Nalloc) {
    193193
    194194  off_t i;
    195195  Image *out;
    196196
    197   ALLOCATE_ZERO (out, Image, Nvalues);
     197  char *buffer;
     198  ALLOCATE_ZERO (buffer, char, Nalloc);
     199  out = (Image *) buffer;
     200  // ALLOCATE_ZERO (out, Image, Nvalues);
    198201
    199202  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_loneos.c

    r34749 r35234  
    170170
    171171/* convert loneos-format images to internal images */
    172 Image *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues) {
     172Image *Image_Loneos_ToInternal (Image_Loneos *in, off_t Nvalues, off_t Nalloc) {
    173173
    174174  off_t i;
    175175  Image *out;
    176176
    177   ALLOCATE_ZERO (out, Image, Nvalues);
     177  char *buffer;
     178  ALLOCATE_ZERO (buffer, char, Nalloc);
     179  out = (Image *) buffer;
     180  // ALLOCATE_ZERO (out, Image, Nvalues);
    178181
    179182  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

    r34749 r35234  
    210210
    211211/* convert panstarrs-format images to internal images */
    212 Image *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, off_t Nvalues) {
     212Image *Image_Panstarrs_DEV_0_ToInternal (Image_Panstarrs_DEV_0 *in, off_t Nvalues, off_t Nalloc) {
    213213
    214214  off_t i;
    215215  Image *out;
    216216
    217   ALLOCATE_ZERO (out, Image, Nvalues);
     217  char *buffer;
     218  ALLOCATE_ZERO (buffer, char, Nalloc);
     219  out = (Image *) buffer;
     220  // ALLOCATE_ZERO (out, Image, Nvalues);
    218221
    219222  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

    r34749 r35234  
    210210
    211211/* convert panstarrs-format images to internal images */
    212 Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, off_t Nvalues) {
     212Image *Image_Panstarrs_DEV_1_ToInternal (Image_Panstarrs_DEV_1 *in, off_t Nvalues, off_t Nalloc) {
    213213
    214214  off_t i;
    215215  Image *out;
    216216
    217   ALLOCATE_ZERO (out, Image, Nvalues);
     217  char *buffer;
     218  ALLOCATE_ZERO (buffer, char, Nalloc);
     219  out = (Image *) buffer;
     220  // ALLOCATE_ZERO (out, Image, Nvalues);
    218221
    219222  for (i = 0; i < Nvalues; i++) {

  • branches/eam_branches/ipp-20130207/Ohana/src/libdvo/src/dvo_image.c

    r34405 r35234  
    8484  }
    8585  if (!status) return (FALSE);
     86
     87  // XXX this is the problem... the conversion (external to internal) is
     88  // only allocated Nimage * sizeof(image) not padded to FITS blocks,
     89  // so when we later do a gfits_copy_ftable, we stomp on bad memory
    8690  FtableToImage (&db[0].ftable, &db[0].theader, &db[0].format);
    8791  db[0].swapped = TRUE;  /* table has internal byte-order */

  • branches/eam_branches/ipp-20130207/Ohana/src/libfits/include/gfitsio.h

    r33648 r35234  
    123123off_t   gfits_data_size                PROTO((Header *header));
    124124off_t   gfits_data_min_size            PROTO((Header *header));
     125off_t   gfits_data_pad_size            PROTO((off_t rawsize));
    125126int     gfits_extended_to_primary      PROTO((Header *header, int simple, char *comment));
    126127int     gfits_primary_to_extended      PROTO((Header *header, char *exttype, char *comment));

  • branches/eam_branches/ipp-20130207/Ohana/src/libfits/matrix/F_matrix.c

    r27435 r35234  
    4343  return (size);
    4444}
     45
     46off_t gfits_data_pad_size (off_t rawsize) {
     47 
     48  off_t Nrec, size;
     49
     50  size = rawsize;
     51
     52  /* round up to next complete block */
     53  if (rawsize % FT_RECORD_SIZE) {
     54    Nrec = 1 + (int) (rawsize / FT_RECORD_SIZE);
     55    size = FT_RECORD_SIZE * Nrec;
     56  }
     57
     58  return (size);
     59}

  • branches/eam_branches/ipp-20130207/Ohana/src/libohana/src

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20130207/Ohana/src/opihi

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20130207/Ohana/src/opihi/cmd.astro

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20130207/Ohana/src/opihi/cmd.data

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.