IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38428


Ignore:
Timestamp:
Jun 8, 2015, 11:45:23 AM (11 years ago)
Author:
eugene
Message:

fix initialization issues for optimized build; remove excess verbosity

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20150429/src/libdvo/src/dvo_catalog_split.c

    r38427 r38428  
    131131
    132132  if (isCompressed) {
    133     fprintf (stderr, "compress %s\n", catalog->filename);
     133    / fprintf (stderr, "compress %s\n", catalog->filename);
    134134    char *compressMode = dvo_catalog_compress_string (catalog->catcompress);
    135135    // I should test how Ntile affects fpack/funpack and speed
    … …  
    762762int dvo_catalog_save_split (Catalog *catalog, char VERBOSE) {
    763763
    764   off_t Nitems;
    765764  Header header;
    766765  FTable ftable;
    … …  
    768767  int Nsecfilt;
    769768  off_t Naverage_disk_new, Nmeasure_disk_new, Nmissing_disk_new, Nsecfilt_disk_new, Nlensing_disk_new, Nlensobj_disk_new, Nstarpar_disk_new, Ngalphot_disk_new;
    770   off_t first, start, Nrows;
    771769
    772770  ftable.header = &header;
    … …  
    821819  if ((catalog[0].catflags & DVO_LOAD_AVERAGE) && (catalog[0].average != NULL)) {
    822820
    823     first  = 0;                    // first row in memory to write
    824     start  = catalog[0].Naverage_off; // first disk row to write
    825     Nrows  = catalog[0].Naverage - first;
     821    off_t first  = 0;                    // first row in memory to write
     822    off_t start  = catalog[0].Naverage_off; // first disk row to write
     823    off_t Nrows  = catalog[0].Naverage - first;
    826824
    827825    assert (Nrows >= 0);
    … …  
    865863  if ((catalog[0].catflags & DVO_LOAD_MEASURE) && (catalog[0].measure != NULL)) {
    866864
    867     first  = 0;                    // first row in memory to write
    868     start  = catalog[0].Nmeasure_off; // first disk row to write
    869     Nrows  = catalog[0].Nmeasure - first;
     865    off_t first  = 0;                    // first row in memory to write
     866    off_t start  = catalog[0].Nmeasure_off; // first disk row to write
     867    off_t Nrows  = catalog[0].Nmeasure - first;
    870868
    871869    assert (Nrows >= 0);
    … …  
    902900
    903901    // if we are going to compress, we need to receive unswapped data --
    904     int swapFromNative = !output_is_compressed (start, Nrows, Nmissing_disk_new, catalog->catcompress);
     902    int swapFromNative = !output_is_compressed (catalog[0].Nmissing_off, catalog[0].Nmissing, Nmissing_disk_new, catalog->catcompress);
    905903
    906904    // convert to external table format
    … …  
    923921  if ((catalog[0].catflags & DVO_LOAD_SECFILT) && (catalog[0].secfilt != NULL)) {
    924922
    925     first  = 0;                    // first row in memory to write
    926     start  = catalog[0].Nsecfilt_off; // first disk row to write
    927     Nitems = catalog[0].Naverage*Nsecfilt;
    928     Nrows  = Nitems - first;
     923    off_t first  = 0;                    // first row in memory to write
     924    off_t start  = catalog[0].Nsecfilt_off; // first disk row to write
     925    off_t Nitems = catalog[0].Naverage*Nsecfilt;
     926    off_t Nrows  = Nitems - first;
    929927
    930928    assert (Nrows >= 0);
    … …  
    956954  if ((catalog[0].catflags & DVO_LOAD_LENSING) && (catalog[0].lensing != NULL)) {
    957955
    958     first  = 0;                    // first row in memory to write
    959     start  = catalog[0].Nlensing_off; // first disk row to write
    960     Nrows  = catalog[0].Nlensing - first;
     956    off_t first  = 0;                    // first row in memory to write
     957    off_t start  = catalog[0].Nlensing_off; // first disk row to write
     958    off_t Nrows  = catalog[0].Nlensing - first;
    961959
    962960    assert (Nrows >= 0);
    … …  
    987985  if ((catalog[0].catflags & DVO_LOAD_LENSOBJ) && (catalog[0].lensobj != NULL)) {
    988986
    989     first  = 0;                    // first row in memory to write
    990     start  = catalog[0].Nlensobj_off; // first disk row to write
    991     Nrows  = catalog[0].Nlensobj - first;
     987    off_t first  = 0;                    // first row in memory to write
     988    off_t start  = catalog[0].Nlensobj_off; // first disk row to write
     989    off_t Nrows  = catalog[0].Nlensobj - first;
    992990
    993991    assert (Nrows >= 0);
    … …  
    10181016  if ((catalog[0].catflags & DVO_LOAD_STARPAR) && (catalog[0].starpar != NULL)) {
    10191017
    1020     first  = 0;                    // first row in memory to write
    1021     start  = catalog[0].Nstarpar_off; // first disk row to write
    1022     Nrows  = catalog[0].Nstarpar - first;
     1018    off_t first  = 0;                    // first row in memory to write
     1019    off_t start  = catalog[0].Nstarpar_off; // first disk row to write
     1020    off_t Nrows  = catalog[0].Nstarpar - first;
    10231021
    10241022    assert (Nrows >= 0);
    … …  
    10491047  if ((catalog[0].catflags & DVO_LOAD_GALPHOT) && (catalog[0].galphot != NULL)) {
    10501048
    1051     first  = 0;                    // first row in memory to write
    1052     start  = catalog[0].Ngalphot_off; // first disk row to write
    1053     Nrows  = catalog[0].Ngalphot - first;
     1049    off_t first  = 0;                    // first row in memory to write
     1050    off_t start  = catalog[0].Ngalphot_off; // first disk row to write
     1051    off_t Nrows  = catalog[0].Ngalphot - first;
    10541052
    10551053    assert (Nrows >= 0);
Note: See TracChangeset for help on using the changeset viewer.