IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39359


Ignore:
Timestamp:
Feb 18, 2016, 5:36:14 PM (10 years ago)
Author:
eugene
Message:

add support for timing tests and AUTO_1,AUTO_2 types (not yet ready for use)

Location:
trunk/Ohana/src/libdvo
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libdvo/include/dvo.h

    r39319 r39359  
    1313
    1414/* DVO table modes */
    15 typedef enum {DVO_COMPRESS_NONE = 0, DVO_COMPRESS_NONE_1, DVO_COMPRESS_NONE_2, DVO_COMPRESS_AUTO, DVO_COMPRESS_GZIP_1, DVO_COMPRESS_GZIP_2, DVO_COMPRESS_RICE_1} DVOCatCompress; //
     15typedef enum {DVO_COMPRESS_NONE = 0, DVO_COMPRESS_NONE_1, DVO_COMPRESS_NONE_2, DVO_COMPRESS_AUTO, DVO_COMPRESS_AUTO_1, DVO_COMPRESS_AUTO_2, DVO_COMPRESS_GZIP_1, DVO_COMPRESS_GZIP_2, DVO_COMPRESS_RICE_1} DVOCatCompress; //
    1616
    1717/* DVO table formats */

  • trunk/Ohana/src/libdvo/src/dvo_catalog.c

    r39332 r39359  
    7676  if (!strcasecmp (catcompress, "NONE"))   return (DVO_COMPRESS_NONE);
    7777  if (!strcasecmp (catcompress, "AUTO"))   return (DVO_COMPRESS_AUTO);
     78  if (!strcasecmp (catcompress, "AUTO_1")) return (DVO_COMPRESS_AUTO_1);
     79  if (!strcasecmp (catcompress, "AUTO_2")) return (DVO_COMPRESS_AUTO_2);
    7880  if (!strcasecmp (catcompress, "NONE_1")) return (DVO_COMPRESS_NONE_1);
    7981  if (!strcasecmp (catcompress, "NONE_2")) return (DVO_COMPRESS_NONE_2);
    … …  
    9395    case DVO_COMPRESS_AUTO:
    9496      compress_string = strcreate("AUTO");
     97      break;
     98    case DVO_COMPRESS_AUTO_1:
     99      compress_string = strcreate("AUTO_1");
     100      break;
     101    case DVO_COMPRESS_AUTO_2:
     102      compress_string = strcreate("AUTO_2");
    95103      break;
    96104    case DVO_COMPRESS_GZIP_1:

  • trunk/Ohana/src/libdvo/src/dvo_catalog_split.c

    r39327 r39359  
    11# include <dvo.h>
    22# define OHANA_MEMCHECK 0
     3
     4void gfits_compress_timing ();
     5void gfits_uncompress_timing ();
    36
    47// return options:
    … …  
    8891}
    8992
    90 int dvo_catalog_save_subcat (Catalog *catalog, FTable *ftable, off_t start, off_t Nrows, off_t Ndisk, off_t Ntotal) {
     93int dvo_catalog_save_subcat (Catalog *catalog, FTable *ftable, off_t start, off_t Nrows, off_t Ndisk, off_t Ntotal, int VERBOSE) {
    9194
    9295  if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
    … …  
    152155      return (FALSE);
    153156    }
     157    if (VERBOSE) gfits_compress_timing ();
    154158    if (!byteswap_varlength_ftable (&cmpheader, &cmptable)) {
    155159      fprintf (stderr, "failed to swap varlength column\n");
    … …  
    341345      return FALSE;
    342346    }
     347    if (VERBOSE) gfits_uncompress_timing ();
    343348    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
    344349
    … …  
    929934    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
    930935
    931     if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new)) {
     936    if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new, VERBOSE)) {
    932937      fprintf (stderr, "failure writing Average table\n");
    933938      goto failure;
    … …  
    978983    // write out Measure table
    979984    catalog->measure_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    980     if (!dvo_catalog_save_subcat (catalog[0].measure_catalog, &ftable, start, Nrows, catalog[0].Nmeasure_disk, Nmeasure_disk_new)) {
     985    if (!dvo_catalog_save_subcat (catalog[0].measure_catalog, &ftable, start, Nrows, catalog[0].Nmeasure_disk, Nmeasure_disk_new, VERBOSE)) {
    981986      fprintf (stderr, "trouble writing Measure table\n");
    982987      goto failure;
    … …  
    10071012    // write out Missing table (must write out entire table)
    10081013    catalog->missing_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1009     if (!dvo_catalog_save_subcat (catalog[0].missing_catalog, &ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing)) {
     1014    if (!dvo_catalog_save_subcat (catalog[0].missing_catalog, &ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing, VERBOSE)) {
    10101015      fprintf (stderr, "trouble writing Missing Table\n");
    10111016      goto failure;
    … …  
    10441049    // write out SecFilt table
    10451050    catalog->secfilt_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1046     if (!dvo_catalog_save_subcat (catalog[0].secfilt_catalog, &ftable, start, Nrows, catalog[0].Nsecfilt_disk, Nsecfilt_disk_new)) {
     1051    if (!dvo_catalog_save_subcat (catalog[0].secfilt_catalog, &ftable, start, Nrows, catalog[0].Nsecfilt_disk, Nsecfilt_disk_new, VERBOSE)) {
    10471052      fprintf (stderr, "failure writing SecFilt table\n");
    10481053      goto failure;
    … …  
    10751080    // write out Lensing table
    10761081    catalog->lensing_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1077     if (!dvo_catalog_save_subcat (catalog[0].lensing_catalog, &ftable, start, Nrows, catalog[0].Nlensing_disk, Nlensing_disk_new)) {
     1082    if (!dvo_catalog_save_subcat (catalog[0].lensing_catalog, &ftable, start, Nrows, catalog[0].Nlensing_disk, Nlensing_disk_new, VERBOSE)) {
    10781083      fprintf (stderr, "trouble writing Lensing table\n");
    10791084      goto failure;
    … …  
    11061111    // write out Lensobj table
    11071112    catalog->lensobj_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1108     if (!dvo_catalog_save_subcat (catalog[0].lensobj_catalog, &ftable, start, Nrows, catalog[0].Nlensobj_disk, Nlensobj_disk_new)) {
     1113    if (!dvo_catalog_save_subcat (catalog[0].lensobj_catalog, &ftable, start, Nrows, catalog[0].Nlensobj_disk, Nlensobj_disk_new, VERBOSE)) {
    11091114      fprintf (stderr, "trouble writing Lensobj table\n");
    11101115      goto failure;
    … …  
    11371142    // write out StarPar table
    11381143    catalog->starpar_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1139     if (!dvo_catalog_save_subcat (catalog[0].starpar_catalog, &ftable, start, Nrows, catalog[0].Nstarpar_disk, Nstarpar_disk_new)) {
     1144    if (!dvo_catalog_save_subcat (catalog[0].starpar_catalog, &ftable, start, Nrows, catalog[0].Nstarpar_disk, Nstarpar_disk_new, VERBOSE)) {
    11401145      fprintf (stderr, "trouble writing StarPar table\n");
    11411146      goto failure;
    … …  
    11681173    // write out GalPhot table
    11691174    catalog->galphot_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1170     if (!dvo_catalog_save_subcat (catalog[0].galphot_catalog, &ftable, start, Nrows, catalog[0].Ngalphot_disk, Ngalphot_disk_new)) {
     1175    if (!dvo_catalog_save_subcat (catalog[0].galphot_catalog, &ftable, start, Nrows, catalog[0].Ngalphot_disk, Ngalphot_disk_new, VERBOSE)) {
    11711176      fprintf (stderr, "trouble writing GalPhot table\n");
    11721177      goto failure;
    … …  
    12701275    }
    12711276
    1272     if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new)) {
     1277    if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new, VERBOSE)) {
    12731278      fprintf (stderr, "failure writing Average table\n");
    12741279      goto failure;
    … …  
    13081313
    13091314    // write out Measure table
    1310     if (!dvo_catalog_save_subcat (catalog[0].measure_catalog, &ftable, start, Nrows, catalog[0].Nmeasure_disk, Nmeasure_disk_new)) {
     1315    if (!dvo_catalog_save_subcat (catalog[0].measure_catalog, &ftable, start, Nrows, catalog[0].Nmeasure_disk, Nmeasure_disk_new, VERBOSE)) {
    13111316      fprintf (stderr, "trouble writing Measure table\n");
    13121317      goto failure;
    … …  
    13311336
    13321337    // write out Missing table (must write out entire table)
    1333     if (!dvo_catalog_save_subcat (catalog[0].missing_catalog, &ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing)) {
     1338    if (!dvo_catalog_save_subcat (catalog[0].missing_catalog, &ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing, VERBOSE)) {
    13341339      fprintf (stderr, "trouble writing Missing Table\n");
    13351340      goto failure;
    … …  
    13601365
    13611366    // write out SecFilt table
    1362     if (!dvo_catalog_save_subcat (catalog[0].secfilt_catalog, &ftable, start, Nrows, catalog[0].Nsecfilt_disk, Nsecfilt_disk_new)) {
     1367    if (!dvo_catalog_save_subcat (catalog[0].secfilt_catalog, &ftable, start, Nrows, catalog[0].Nsecfilt_disk, Nsecfilt_disk_new, VERBOSE)) {
    13631368      fprintf (stderr, "failure writing SecFilt table\n");
    13641369      goto failure;
    … …  
    13881393
    13891394      // write out Lensing table
    1390       if (!dvo_catalog_save_subcat (catalog[0].lensing_catalog, &ftable, start, Nrows, catalog[0].Nlensing_disk, Nlensing_disk_new)) {
     1395      if (!dvo_catalog_save_subcat (catalog[0].lensing_catalog, &ftable, start, Nrows, catalog[0].Nlensing_disk, Nlensing_disk_new, VERBOSE)) {
    13911396        fprintf (stderr, "trouble writing Lensing table\n");
    13921397        goto failure;
    … …  
    14171422
    14181423      // write out Lensobj table
    1419       if (!dvo_catalog_save_subcat (catalog[0].lensobj_catalog, &ftable, start, Nrows, catalog[0].Nlensobj_disk, Nlensobj_disk_new)) {
     1424      if (!dvo_catalog_save_subcat (catalog[0].lensobj_catalog, &ftable, start, Nrows, catalog[0].Nlensobj_disk, Nlensobj_disk_new, VERBOSE)) {
    14201425        fprintf (stderr, "trouble writing Lensobj table\n");
    14211426        goto failure;
    … …  
    14461451
    14471452      // write out StarPar table
    1448       if (!dvo_catalog_save_subcat (catalog[0].starpar_catalog, &ftable, start, Nrows, catalog[0].Nstarpar_disk, Nstarpar_disk_new)) {
     1453      if (!dvo_catalog_save_subcat (catalog[0].starpar_catalog, &ftable, start, Nrows, catalog[0].Nstarpar_disk, Nstarpar_disk_new, VERBOSE)) {
    14491454        fprintf (stderr, "trouble writing StarPar table\n");
    14501455        goto failure;
    … …  
    14751480
    14761481      // write out GalPhot table
    1477       if (!dvo_catalog_save_subcat (catalog[0].galphot_catalog, &ftable, start, Nrows, catalog[0].Ngalphot_disk, Ngalphot_disk_new)) {
     1482      if (!dvo_catalog_save_subcat (catalog[0].galphot_catalog, &ftable, start, Nrows, catalog[0].Ngalphot_disk, Ngalphot_disk_new, VERBOSE)) {
    14781483        fprintf (stderr, "trouble writing GalPhot table\n");
    14791484        goto failure;
    … …  
    16251630    if (OHANA_MEMCHECK) ohana_memcheck (TRUE);
    16261631
    1627     if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new)) {
     1632    if (!dvo_catalog_save_subcat (catalog, &ftable, start, Nrows, catalog[0].Naverage_disk, Naverage_disk_new, VERBOSE)) {
    16281633      fprintf (stderr, "failure writing Average table\n");
    16291634      goto failure;
    … …  
    16751680    // write out Measure table
    16761681    catalog->measure_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1677     if (!dvo_catalog_save_subcat (catalog[0].measure_catalog, &ftable, start, Nrows, catalog[0].Nmeasure_disk, Nmeasure_disk_new)) {
     1682    if (!dvo_catalog_save_subcat (catalog[0].measure_catalog, &ftable, start, Nrows, catalog[0].Nmeasure_disk, Nmeasure_disk_new, VERBOSE)) {
    16781683      fprintf (stderr, "trouble writing Measure table\n");
    16791684      goto failure;
    … …  
    17071712    // write out Missing table (must write out entire table)
    17081713    catalog->missing_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1709     if (!dvo_catalog_save_subcat (catalog[0].missing_catalog, &ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing)) {
     1714    if (!dvo_catalog_save_subcat (catalog[0].missing_catalog, &ftable, 0, catalog[0].Nmissing, catalog[0].Nmissing, catalog[0].Nmissing, VERBOSE)) {
    17101715      fprintf (stderr, "trouble writing Missing Table\n");
    17111716      goto failure;
    … …  
    17441749    // write out SecFilt table
    17451750    catalog->secfilt_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1746     if (!dvo_catalog_save_subcat (catalog[0].secfilt_catalog, &ftable, start, Nrows, catalog[0].Nsecfilt_disk, Nsecfilt_disk_new)) {
     1751    if (!dvo_catalog_save_subcat (catalog[0].secfilt_catalog, &ftable, start, Nrows, catalog[0].Nsecfilt_disk, Nsecfilt_disk_new, VERBOSE)) {
    17471752      fprintf (stderr, "failure writing SecFilt table\n");
    17481753      goto failure;
    … …  
    17751780    // write out Lensing table
    17761781    catalog->lensing_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1777     if (!dvo_catalog_save_subcat (catalog[0].lensing_catalog, &ftable, start, Nrows, catalog[0].Nlensing_disk, Nlensing_disk_new)) {
     1782    if (!dvo_catalog_save_subcat (catalog[0].lensing_catalog, &ftable, start, Nrows, catalog[0].Nlensing_disk, Nlensing_disk_new, VERBOSE)) {
    17781783      fprintf (stderr, "trouble writing Lensing table\n");
    17791784      goto failure;
    … …  
    18061811    // write out Lensobj table
    18071812    catalog->lensobj_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1808     if (!dvo_catalog_save_subcat (catalog[0].lensobj_catalog, &ftable, start, Nrows, catalog[0].Nlensobj_disk, Nlensobj_disk_new)) {
     1813    if (!dvo_catalog_save_subcat (catalog[0].lensobj_catalog, &ftable, start, Nrows, catalog[0].Nlensobj_disk, Nlensobj_disk_new, VERBOSE)) {
    18091814      fprintf (stderr, "trouble writing Lensobj table\n");
    18101815      goto failure;
    … …  
    18371842    // write out StarPar table
    18381843    catalog->starpar_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1839     if (!dvo_catalog_save_subcat (catalog[0].starpar_catalog, &ftable, start, Nrows, catalog[0].Nstarpar_disk, Nstarpar_disk_new)) {
     1844    if (!dvo_catalog_save_subcat (catalog[0].starpar_catalog, &ftable, start, Nrows, catalog[0].Nstarpar_disk, Nstarpar_disk_new, VERBOSE)) {
    18401845      fprintf (stderr, "trouble writing StarPar table\n");
    18411846      goto failure;
    … …  
    18681873    // write out GalPhot table
    18691874    catalog->galphot_catalog->catcompress = catalog->catcompress; // XXX this is a bit of a hack, should be done in an api
    1870     if (!dvo_catalog_save_subcat (catalog[0].galphot_catalog, &ftable, start, Nrows, catalog[0].Ngalphot_disk, Ngalphot_disk_new)) {
     1875    if (!dvo_catalog_save_subcat (catalog[0].galphot_catalog, &ftable, start, Nrows, catalog[0].Ngalphot_disk, Ngalphot_disk_new, VERBOSE)) {
    18711876      fprintf (stderr, "trouble writing GalPhot table\n");
    18721877      goto failure;
Note: See TracChangeset for help on using the changeset viewer.