IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38345


Ignore:
Timestamp:
Jun 1, 2015, 4:28:19 PM (11 years ago)
Author:
eugene
Message:

add compression option to Catalog, compress average table output, add (swap) option to table_get

Location:
branches/eam_branches/ohana.20150429/src
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20150429/src/addstar/src/mkcmf.c

    r37995 r38345  
    500500  }
    501501
    502   gfits_table_set_PS1_DEV_0 (ftable, stars, Nstars);
     502  gfits_table_set_PS1_DEV_0 (ftable, stars, Nstars, TRUE);
    503503  gfits_modify (ftable->header, "EXTTYPE",   "%s", 1, "PS1_DEV_0");
    504504}
    … …  
    547547  }
    548548
    549   gfits_table_set_PS1_DEV_1 (ftable, stars, Nstars);
     549  gfits_table_set_PS1_DEV_1 (ftable, stars, Nstars, TRUE);
    550550  gfits_modify (ftable->header, "EXTTYPE",   "%s", 1, "PS1_DEV_1");
    551551}
    … …  
    596596  }
    597597
    598   gfits_table_set_CMF_PS1_V1 (ftable, stars, Nstars);
     598  gfits_table_set_CMF_PS1_V1 (ftable, stars, Nstars, TRUE);
    599599  gfits_modify (ftable->header, "EXTTYPE",   "%s", 1, "PS1_V1");
    600600}
    … …  
    651651  }
    652652
    653   gfits_table_set_CMF_PS1_V2 (ftable, stars, Nstars);
     653  gfits_table_set_CMF_PS1_V2 (ftable, stars, Nstars, TRUE);
    654654  gfits_modify (ftable->header, "EXTTYPE",   "%s", 1, "PS1_V2");
    655655}
    … …  
    710710  }
    711711
    712   gfits_table_set_CMF_PS1_V3 (ftable, stars, Nstars);
     712  gfits_table_set_CMF_PS1_V3 (ftable, stars, Nstars, TRUE);
    713713  gfits_modify (ftable->header, "EXTTYPE",   "%s", 1, "PS1_V3");
    714714}
    … …  
    778778  }
    779779
    780   gfits_table_set_CMF_PS1_V4 (ftable, stars, Nstars);
     780  gfits_table_set_CMF_PS1_V4 (ftable, stars, Nstars, TRUE);
    781781  gfits_modify (ftable->header, "EXTTYPE",   "%s", 1, "PS1_V4");
    782782}

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_duplicate_images.c

    r38344 r38345  
    6161 
    6262  fprintf (stderr, "removing "OFF_T_FMT" images (leaving "OFF_T_FMT" of "OFF_T_FMT")\n",  Nimage - Noutimage, Noutimage, Nimage);
    63   // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage);
     63  // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage, TRUE);
    6464
    6565  gfits_modify (&db[0].theader, "NAXIS2", OFF_T_FMT, 1,  Noutimage);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_image_photcodes.c

    r38344 r38345  
    3333 
    3434  if (VERBOSE) fprintf (stderr, "removing "OFF_T_FMT" images (leaving "OFF_T_FMT" of "OFF_T_FMT")\n",  Nimage - Noutimage, Noutimage, Nimage);
    35   // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage);
     35  // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage, TRUE);
    3636
    3737  gfits_modify (&db[0].theader, "NAXIS2", OFF_T_FMT, 1,  Noutimage);

  • branches/eam_branches/ohana.20150429/src/delstar/src/delete_imagename.c

    r38344 r38345  
    8282 
    8383  if (VERBOSE) fprintf (stderr, "removing "OFF_T_FMT" images (leaving "OFF_T_FMT" of "OFF_T_FMT")\n",  Nimlist,  Noutimage,  Nimage);
    84   // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage);
     84  // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage, TRUE);
    8585
    8686  gfits_modify (&db[0].theader, "NAXIS2", OFF_T_FMT, 1,  Noutimage);

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairCPT.c

    r37807 r38345  
    156156  gfits_modify_alt (&cptHeaderPHU, "SORTED", "%t",      1,  FALSE);
    157157
     158  myAbort ("test for compression");
     159
    158160  /* convert internal to external format */
    159   if (!AverageToFtable (&cptFtable, average, Naverage, catformat, NULL)) {
     161  if (!AverageToFtable (&cptFtable, average, Naverage, catformat, NULL, TRUE)) {
    160162    myAbort("trouble converting format");
    161163  }

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImageList.c

    r37807 r38345  
    467467  gfits_scan (&cptHeaderPHU, "NSECFILT",     "%d",      1,  &Nsecfilt);
    468468
     469  myAbort ("test for compression");
     470
    469471  /* convert internal to external format */
    470   if (!AverageToFtable (&cptFtable, averageOut, NaverageOut, catformat, NULL)) {
     472  if (!AverageToFtable (&cptFtable, averageOut, NaverageOut, catformat, NULL, TRUE)) {
    471473    myAbort("trouble converting format");
    472474  }

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairDeleteImagesByExternID.c

    r37807 r38345  
    658658  gfits_scan (&cptHeaderPHU, "NSECFILT",     "%d",      1,  &Nsecfilt);
    659659
     660  myAbort ("test for compression");
     661
    660662  /* convert internal to external format */
    661   if (!AverageToFtable (&cptFtable, averageOut, NaverageOut, catformat, NULL)) {
     663  if (!AverageToFtable (&cptFtable, averageOut, NaverageOut, catformat, NULL, TRUE)) {
    662664    myAbort("trouble converting format");
    663665  }

  • branches/eam_branches/ohana.20150429/src/dvomerge/src/dvorepairFixTables.c

    r37807 r38345  
    326326  gfits_scan (&cptHeaderPHU, "NSECFILT",     "%d",      1,  &Nsecfilt);
    327327
     328  myAbort ("test for compression");
     329
    328330  /* convert internal to external format */
    329   if (!AverageToFtable (&cptFtable, averageOut, NaverageOut, catformat, NULL)) {
     331  if (!AverageToFtable (&cptFtable, averageOut, NaverageOut, catformat, NULL, TRUE)) {
    330332    myAbort("trouble converting format");
    331333  }

  • branches/eam_branches/ohana.20150429/src/getstar/src/WriteImageFITS.c

    r14590 r38345  
    3636
    3737  table.header = &theader;
    38   gfits_table_set_SMPData (&table, NULL, Nstars);
     38  gfits_table_set_SMPData (&table, NULL, Nstars, TRUE);
    3939  gfits_fwrite_Theader (f, &theader);
    4040  gfits_fwrite_table   (f, &table);

  • branches/eam_branches/ohana.20150429/src/getstar/src/write_getstar_ps1_dev_0.c

    r37044 r38345  
    111111
    112112  ftable.header = &theader;
    113   gfits_table_set_Getstar_PS1_DEV_0 (&ftable, output, Noutput);
     113  gfits_table_set_Getstar_PS1_DEV_0 (&ftable, output, Noutput, TRUE);
    114114
    115115  gfits_fwrite_header  (f, &header);

  • branches/eam_branches/ohana.20150429/src/getstar/src/write_getstar_ps1_dev_1.c

    r37044 r38345  
    114114
    115115  ftable.header = &theader;
    116   gfits_table_set_Getstar_PS1_DEV_1 (&ftable, output, Noutput);
     116  gfits_table_set_Getstar_PS1_DEV_1 (&ftable, output, Noutput, TRUE);
    117117
    118118  gfits_fwrite_header  (f, &header);

  • branches/eam_branches/ohana.20150429/src/getstar/src/write_getstar_ps1_dev_2.c

    r37044 r38345  
    120120
    121121  ftable.header = &theader;
    122   gfits_table_set_Getstar_PS1_DEV_2 (&ftable, output, Noutput);
     122  gfits_table_set_Getstar_PS1_DEV_2 (&ftable, output, Noutput, TRUE);
    123123
    124124  gfits_fwrite_header  (f, &header);

  • branches/eam_branches/ohana.20150429/src/imclean/src/wfits.c

    r27435 r38345  
    1919   
    2020  table.header = &theader;
    21   gfits_table_set_SMPData (&table, stars, Nstars);
     21  gfits_table_set_SMPData (&table, stars, Nstars, TRUE);
    2222
    2323  gfits_write_header  (filename, header);

  • branches/eam_branches/ohana.20150429/src/imregister/detrend/delete.c

    r28241 r38345  
    4141  /** we may later want to pull this out and put it elsewhere **/
    4242  /** free db[0].theader, db[0].table.buffer? **/
    43   gfits_table_set_DetReg (&db[0].ftable, subset, Nsubset);
     43  gfits_table_set_DetReg (&db[0].ftable, subset, Nsubset, TRUE);
    4444  gfits_db_save (db);
    4545  gfits_db_close (db);

  • branches/eam_branches/ohana.20150429/src/imregister/detrend/output.c

    r27435 r38345  
    5050
    5151  ftable.header = &theader;
    52   gfits_table_set_DetReg (&ftable, subset, Nmatch);
     52  gfits_table_set_DetReg (&ftable, subset, Nmatch, TRUE);
    5353
    5454  gfits_fwrite_header  (f, &header);

  • branches/eam_branches/ohana.20150429/src/imregister/imphot/dumpfits.c

    r37807 r38345  
    3434
    3535  ftable.header = &theader;
    36   // gfits_table_set_Image (&ftable, subset, Nmatch);
     36  // gfits_table_set_Image (&ftable, subset, Nmatch, TRUE);
    3737
    3838  gfits_fwrite_header  (f, &header);

  • branches/eam_branches/ohana.20150429/src/imregister/imreg/delete.c

    r28241 r38345  
    4141  /** we may later want to pull this out and put it elsewhere **/
    4242  /** free db[0].theader, db[0].table.buffer? **/
    43   gfits_table_set_RegImage (&db[0].ftable, subset, Nsubset);
     43  gfits_table_set_RegImage (&db[0].ftable, subset, Nsubset, TRUE);
    4444  gfits_db_save (db);
    4545  gfits_db_close (db);

  • branches/eam_branches/ohana.20150429/src/imregister/imreg/imregclient.c

    r34088 r38345  
    7777  if (db.dbstate == LCK_EMPTY) {
    7878    gfits_db_create (&db);
    79     gfits_table_set_RegImage (&db.ftable, NULL, 0);
     79    gfits_table_set_RegImage (&db.ftable, NULL, 0, TRUE);
    8080  } else { 
    8181    if (!gfits_db_load (&db)) {

  • branches/eam_branches/ohana.20150429/src/imregister/imreg/output.c

    r27435 r38345  
    7777
    7878  ftable.header = &theader;
    79   gfits_table_set_RegImage (&ftable, subset, Nmatch);
     79  gfits_table_set_RegImage (&ftable, subset, Nmatch, TRUE);
    8080
    8181  gfits_fwrite_header  (f, &header);

  • branches/eam_branches/ohana.20150429/src/imregister/photreg/delete.c

    r28241 r38345  
    3838  }
    3939
    40   gfits_table_set_PhotPars (&db[0].ftable, subset, Nsubset);
     40  gfits_table_set_PhotPars (&db[0].ftable, subset, Nsubset, TRUE);
    4141  gfits_db_save (db);
    4242  gfits_db_close (db);

  • branches/eam_branches/ohana.20150429/src/imregister/photreg/output.c

    r27435 r38345  
    5555
    5656  ftable.header = &theader;
    57   gfits_table_set_PhotPars (&ftable, subset, Nmatch);
     57  gfits_table_set_PhotPars (&ftable, subset, Nmatch, TRUE);
    5858
    5959  /* EXTNAME is set to ZERO_POINTS_3.0 by default */

  • branches/eam_branches/ohana.20150429/src/imregister/spreg/delete.c

    r28241 r38345  
    3939  /** we may later want to pull this out and put it elsewhere **/
    4040  /** free db[0].theader, db[0].table.buffer? **/
    41   gfits_table_set_Spectrum (&db[0].ftable, subset, Nsubset);
     41  gfits_table_set_Spectrum (&db[0].ftable, subset, Nsubset, TRUE);
    4242  gfits_db_save (db);
    4343  gfits_db_close (db);

  • branches/eam_branches/ohana.20150429/src/imregister/spreg/output.c

    r27435 r38345  
    6161
    6262  ftable.header = &theader;
    63   gfits_table_set_Spectrum (&ftable, subset, Nmatch);
     63  gfits_table_set_Spectrum (&ftable, subset, Nmatch, TRUE);
    6464
    6565  gfits_fwrite_header   (f, &header);
    … …  
    9696  /* create an empty table which we will fill in by hand */
    9797  ftable.header = &theader;
    98   gfits_table_set_SpectrumASCII (&ftable, NULL, 0);
     98  gfits_table_set_SpectrumASCII (&ftable, NULL, 0, TRUE);
    9999 
    100100  /* add data to table */

  • branches/eam_branches/ohana.20150429/src/imregister/src/detregister.c

    r7080 r38345  
    2929  if (db.dbstate == LCK_EMPTY) {
    3030    gfits_db_create (&db);   
    31     gfits_table_set_DetReg (&db.ftable, NULL, 0);
     31    gfits_table_set_DetReg (&db.ftable, NULL, 0, TRUE);
    3232  } else { 
    3333    if (!gfits_db_load (&db)) {

  • branches/eam_branches/ohana.20150429/src/imregister/src/imregister.c

    r27435 r38345  
    2828  if (db.dbstate == LCK_EMPTY) {
    2929    gfits_db_create (&db);
    30     gfits_table_set_RegImage (&db.ftable, NULL, 0);
     30    gfits_table_set_RegImage (&db.ftable, NULL, 0, TRUE);
    3131  } else { 
    3232    if (!gfits_db_load (&db)) {

  • branches/eam_branches/ohana.20150429/src/imregister/src/imregtable.c

    r38344 r38345  
    5151  if (db.dbstate == LCK_EMPTY) {
    5252    gfits_db_create (&db);
    53     gfits_table_set_RegImage (&db.ftable, NULL, 0);
     53    gfits_table_set_RegImage (&db.ftable, NULL, 0, TRUE);
    5454  } else { 
    5555    if (!gfits_db_load (&db)) {

  • branches/eam_branches/ohana.20150429/src/imregister/src/photreg.c

    r7080 r38345  
    2626  if (db.dbstate == LCK_EMPTY) {
    2727    gfits_db_create (&db);
    28     gfits_table_set_PhotPars (&db.ftable, NULL, 0);
     28    gfits_table_set_PhotPars (&db.ftable, NULL, 0, TRUE);
    2929    /* EXTNAME is set to ZERO_POINTS_3.0 by default */
    3030    if (!strcmp (output.db, "trans")) {

  • branches/eam_branches/ohana.20150429/src/imregister/src/spregister.c

    r7080 r38345  
    2828  if (db.dbstate == LCK_EMPTY) {
    2929    gfits_db_create (&db);
    30     gfits_table_set_Spectrum (&db.ftable, NULL, 0);
     30    gfits_table_set_Spectrum (&db.ftable, NULL, 0, TRUE);
    3131  } else { 
    3232    if (!gfits_db_load (&db)) {

  • branches/eam_branches/ohana.20150429/src/libautocode/def/autocode.c

    r38344 r38345  
    5757}
    5858
    59 int gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, off_t Ndata) {
     59int gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, off_t Ndata, int swapFromNative) {
    6060
    6161  Header *header;
    … …  
    7474  /* add data values */
    7575  if (!gfits_table_scale_data (ftable)) return (FALSE);
    76   if (!gfits_convert_$STRUCT (data, sizeof ($STRUCT), Ndata)) return (FALSE);
     76  if (swapFromNative) {
     77    if (!gfits_convert_$STRUCT (data, sizeof ($STRUCT), Ndata)) return (FALSE);
     78  }
    7779  if (!gfits_add_rows (ftable, (char *) data, Ndata, sizeof ($STRUCT))) return (FALSE);
    7880

  • branches/eam_branches/ohana.20150429/src/libautocode/def/autocode.h

    r38344 r38345  
    33
    44$STRUCT *gfits_table_get_$STRUCT (FTable *table, off_t *Ndata, char *scaledValue, char *nativeOrder);
    5 int      gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, off_t Ndata);
     5int      gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, off_t Ndata, int swapFromNative);
    66int      gfits_table_mkheader_$STRUCT (Header *header);
    77int      gfits_convert_$STRUCT ($STRUCT *data, off_t size, off_t nitems);

  • branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h

    r38344 r38345  
    789789  char catformat;                       /* storage format (elixir, panstarrs, etc) */
    790790  int sorted;                           /* is measure table average-sorted? (NOTE this is an int only because gfits_scan %t requires it) */
     791  char compressOutput;
    791792 
    792793  DVOCatFlags catflags; /* choices to be loaded */
    … …  
    977978int      FtableToImage   (FTable *ftable, Header *theader, char *format);
    978979
    979 int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary);
     980int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary, int swapFromNative);
    980981int MeasureToFtable (FTable *ftable, Average *average, Measure *measure, off_t Nmeasure, char format);
    981982int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, char format);

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

    r38344 r38345  
    7878
    7979  ftable.header = &theader;
    80   gfits_table_set_AstromOffsetMap_Disk_6x6 (&ftable, map_disk, Nmap);
     80  gfits_table_set_AstromOffsetMap_Disk_6x6 (&ftable, map_disk, Nmap, TRUE);
    8181
    8282  f = fopen (filename, "w");

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

    r37035 r38345  
    3434  /* convert FITS format data to internal format (byteswaps & EXTNAME) */
    3535  if (!gfits_db_create (&db)) return (FALSE);
    36   if (!gfits_table_set_PhotCode_PS1_V5 (&db.ftable, photcode_output, table[0].Ncode)) return (FALSE);
     36  if (!gfits_table_set_PhotCode_PS1_V5 (&db.ftable, photcode_output, table[0].Ncode, TRUE)) return (FALSE);
    3737  if (!gfits_db_save (&db)) return (FALSE);
    3838  if (!gfits_db_close (&db)) return (FALSE);

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

    r38344 r38345  
    385385
    386386  /* write out Average table (convert to FITS table format) */
    387   AverageToFtable (&ftable, catalog[0].average, catalog[0].Naverage, catalog[0].catformat, primary);
     387  AverageToFtable (&ftable, catalog[0].average, catalog[0].Naverage, catalog[0].catformat, primary, TRUE);
    388388  if (!gfits_fwrite_Theader (catalog[0].f, &header)) {
    389389    fprintf (stderr, "can't write table header");
    … …  
    411411
    412412  /* write out Missing table (convert to FITS table format) */
    413   gfits_table_set_Missing (&ftable, catalog[0].missing, catalog[0].Nmissing);
     413  gfits_table_set_Missing (&ftable, catalog[0].missing, catalog[0].Nmissing, TRUE);
    414414  if (!gfits_fwrite_Theader (catalog[0].f, &header)) {
    415415    fprintf (stderr, "can't write table header");

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

    r38344 r38345  
    151151  gfits_free_matrix (&matrix);
    152152
     153  FTable *outtable = ftable;
     154  FTable cmptable;
     155  Header cmpheader;
     156  cmptable.header = &cmpheader;
     157  gfits_init_header (&cmpheader);
     158  gfits_init_table (&cmptable);
     159 
     160  int fullWrite = (start == 0) && (Nrows == Ntotal);
     161
     162  if (fullWrite && catalog->compressOutput) {
     163    if (!gfits_compress_table (ftable, &cmptable, 10, "GZIP_1")) {
     164      fprintf (stderr, "compression failure\n");
     165      return (FALSE);
     166    }
     167    outtable = &cmptable;
     168  }
     169
    153170  // write the table data
    154   if (!gfits_fwrite_ftable_range (catalog->f, ftable, start, Nrows, Ndisk, Ntotal)) {
     171  if (!gfits_fwrite_ftable_range (catalog->f, outtable, start, Nrows, Ndisk, Ntotal)) {
    155172    fprintf (stderr, "can't write table data\n");
    156173    return (FALSE);
    157174  }
    158   fullsize += ftable->datasize + ftable->header->datasize;
     175  fullsize += outtable->datasize + outtable->header->datasize;
     176
     177  // since we init'ed the structures above, these operations are safe whether or not we compressed the table
     178  gfits_free_header (&cmpheader);
     179  gfits_free_table (&cmptable);
    159180
    160181  // if the output file will be completely re-written, truncate to total datasize
    161   if ((start == 0) && (Nrows == Ntotal)) {
     182  if (fullWrite) {
    162183    int fd = fileno (catalog->f);
    163184    if (ftruncate (fd, fullsize)) {
    … …  
    975996    assert (catalog[0].Naves_disk >= catalog[0].Naves_off);
    976997
    977     /* convert internal to external format */
    978     if (!AverageToFtable (&ftable, &catalog[0].average[first], Nrows, catalog[0].catformat, primary)) {
     998    /* convert internal to external format : also results in a byte-swapped, scaled output
     999       table.  Note that ftable is newly allocated.
     1000     */
     1001   
     1002    // if we are going to compress, we need to receive unswapped data --
     1003    // gfits_compress_table expectes a table with unswapped data values
     1004    int swapFromNative = TRUE;
     1005    int fullWrite = (start == 0) && (Nrows == Naves_disk_new);
     1006    if (fullWrite && catalog->compressOutput) {
     1007      swapFromNative = FALSE;
     1008    }
     1009
     1010    if (!AverageToFtable (&ftable, &catalog[0].average[first], Nrows, catalog[0].catformat, primary, swapFromNative)) {
    9791011      fprintf (stderr, "trouble converting format\n");
    9801012      goto failure;
    … …  
    10361068
    10371069    // convert to external table format
    1038     if (!gfits_table_set_Missing (&ftable, catalog[0].missing, catalog[0].Nmissing)) {
     1070    if (!gfits_table_set_Missing (&ftable, catalog[0].missing, catalog[0].Nmissing, TRUE)) {
    10391071      fprintf (stderr, "trouble converting format\n");
    10401072      goto failure;
    … …  
    13151347
    13161348    /* convert internal to external format */
    1317     if (!AverageToFtable (&ftable, &catalog[0].average[first], Nrows, catalog[0].catformat, primary)) {
     1349    if (!AverageToFtable (&ftable, &catalog[0].average[first], Nrows, catalog[0].catformat, primary, TRUE)) {
    13181350      fprintf (stderr, "trouble converting format\n");
    13191351      goto failure;
    … …  
    13751407
    13761408    // convert to external table format
    1377     if (!gfits_table_set_Missing (&ftable, catalog[0].missing, catalog[0].Nmissing)) {
     1409    if (!gfits_table_set_Missing (&ftable, catalog[0].missing, catalog[0].Nmissing, TRUE)) {
    13781410      fprintf (stderr, "trouble converting format\n");
    13791411      goto failure;
    … …  
    16111643
    16121644    /* convert internal to external format */
    1613     if (!AverageToFtable (&ftable, &catalog[0].average[first], Nrows, catalog[0].catformat, primary)) {
     1645    if (!AverageToFtable (&ftable, &catalog[0].average[first], Nrows, catalog[0].catformat, primary, TRUE)) {
    16141646      fprintf (stderr, "trouble converting format\n");
    16151647      goto failure;
    … …  
    16761708
    16771709    // convert to external table format
    1678     if (!gfits_table_set_Missing (&ftable, catalog[0].missing, catalog[0].Nmissing)) {
     1710    if (!gfits_table_set_Missing (&ftable, catalog[0].missing, catalog[0].Nmissing, TRUE)) {
    16791711      fprintf (stderr, "trouble converting format\n");
    16801712      goto failure;

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

    r38344 r38345  
    139139}
    140140
    141 int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary) {
    142 
    143 # define FORMAT_CASE(FORMAT, TYPE) \
    144     case DVO_FORMAT_##FORMAT: { \
    145       Average_##TYPE *tmpAverage; \
     141int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary, int swapFromNative) {
     142 
     143# define FORMAT_CASE(FORMAT, TYPE)              \
     144  case DVO_FORMAT_##FORMAT: {                                           \
     145    Average_##TYPE *tmpAverage;                                         \
    146146      tmpAverage = AverageInternalTo_##TYPE (average, Naverage, primary); \
    147       gfits_table_set_Average_##TYPE (ftable, tmpAverage, Naverage); \
    148       free (tmpAverage); \
    149       break; }
    150 
     147        gfits_table_set_Average_##TYPE (ftable, tmpAverage, Naverage, swapFromNative); \
     148          free (tmpAverage);                                            \
     149          break; }
     150 
    151151  /* convert from the internal format */
    152152  switch (format) {
    153153    case DVO_FORMAT_INTERNAL: {
    154       gfits_table_set_Average (ftable, average, Naverage);
     154      gfits_table_set_Average (ftable, average, Naverage, TRUE);
    155155      break; }
    156156
    … …  
    276276      myAssert (ABS_COORDS || average, "conversion from internal needs average table"); \
    277277      tmpMeasure = MeasureInternalTo_##TYPE (average, measure, Nmeasure); \
    278       gfits_table_set_Measure_##TYPE (ftable, tmpMeasure, Nmeasure); \
     278        gfits_table_set_Measure_##TYPE (ftable, tmpMeasure, Nmeasure, TRUE); \
    279279      free (tmpMeasure); \
    280280      break; }
    … …  
    283283  switch (format) {
    284284    case DVO_FORMAT_INTERNAL: {
    285       gfits_table_set_Measure (ftable, measure, Nmeasure);
     285      gfits_table_set_Measure (ftable, measure, Nmeasure, TRUE);
    286286      break; }
    287287
    … …  
    386386      SecFilt_##TYPE *tmpSecFilt; \
    387387      tmpSecFilt = SecFiltInternalTo_##TYPE (secfilt, Nsecfilt); \
    388       gfits_table_set_SecFilt_##TYPE (ftable, tmpSecFilt, Nsecfilt); \
     388        gfits_table_set_SecFilt_##TYPE (ftable, tmpSecFilt, Nsecfilt, TRUE); \
    389389      free (tmpSecFilt); \
    390390      break; }
    … …  
    393393  switch (format) {
    394394    case DVO_FORMAT_INTERNAL: {
    395       gfits_table_set_SecFilt (ftable, secfilt, Nsecfilt);
     395      gfits_table_set_SecFilt (ftable, secfilt, Nsecfilt, TRUE);
    396396      break; }
    397397
    … …  
    526526      Lensing_##TYPE *tmpLensing; \
    527527      tmpLensing = LensingInternalTo_##TYPE (lensing, Nlensing); \
    528       gfits_table_set_Lensing_##TYPE (ftable, tmpLensing, Nlensing); \
     528        gfits_table_set_Lensing_##TYPE (ftable, tmpLensing, Nlensing, TRUE); \
    529529      free (tmpLensing); \
    530530      break; }
    … …  
    533533  switch (format) {
    534534    case DVO_FORMAT_INTERNAL: {
    535       gfits_table_set_Lensing (ftable, lensing, Nlensing);
     535      gfits_table_set_Lensing (ftable, lensing, Nlensing, TRUE);
    536536      break; }
    537537
    … …  
    641641      Lensobj_##TYPE *tmpLensobj; \
    642642      tmpLensobj = LensobjInternalTo_##TYPE (lensobj, Nlensobj); \
    643       gfits_table_set_Lensobj_##TYPE (ftable, tmpLensobj, Nlensobj); \
     643        gfits_table_set_Lensobj_##TYPE (ftable, tmpLensobj, Nlensobj, TRUE); \
    644644      free (tmpLensobj); \
    645645      break; }
    … …  
    648648  switch (format) {
    649649    case DVO_FORMAT_INTERNAL: {
    650       gfits_table_set_Lensobj (ftable, lensobj, Nlensobj);
     650      gfits_table_set_Lensobj (ftable, lensobj, Nlensobj, TRUE);
    651651      break; }
    652652
    … …  
    744744      StarPar_##TYPE *tmpStarPar; \
    745745      tmpStarPar = StarParInternalTo_##TYPE (starpar, Nstarpar); \
    746       gfits_table_set_StarPar_##TYPE (ftable, tmpStarPar, Nstarpar); \
     746        gfits_table_set_StarPar_##TYPE (ftable, tmpStarPar, Nstarpar, TRUE); \
    747747      free (tmpStarPar); \
    748748      break; }
    … …  
    751751  switch (format) {
    752752    case DVO_FORMAT_INTERNAL: {
    753       gfits_table_set_StarPar (ftable, starpar, Nstarpar);
     753      gfits_table_set_StarPar (ftable, starpar, Nstarpar, TRUE);
    754754      break; }
    755755
    … …  
    848848      GalShape_##TYPE *tmpGalShape; \
    849849      tmpGalShape = GalShapeInternalTo_##TYPE (galshape, Ngalshape); \
    850       gfits_table_set_GalShape_##TYPE (ftable, tmpGalShape, Ngalshape); \
     850        gfits_table_set_GalShape_##TYPE (ftable, tmpGalShape, Ngalshape, TRUE); \
    851851      free (tmpGalShape); \
    852852      break; }
    … …  
    855855  switch (format) {
    856856    case DVO_FORMAT_INTERNAL: {
    857       gfits_table_set_GalShape (ftable, galshape, Ngalshape);
     857      gfits_table_set_GalShape (ftable, galshape, Ngalshape, TRUE);
    858858      break; }
    859859
    … …  
    963963      tmpImage = ImageInternalTo_##TYPE ((Image *) ftable[0].buffer, Nimage); \
    964964      free (ftable[0].buffer); \
    965       gfits_table_set_Image_##TYPE (ftable, tmpImage, Nimage); \
     965      gfits_table_set_Image_##TYPE (ftable, tmpImage, Nimage, TRUE); \
    966966      free (tmpImage); \
    967967      break; }

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

    r38344 r38345  
    161161
    162162  ftableImage.header = &theaderImage;
    163   gfits_table_set_FlatCorrectionImage (&ftableImage, image, flatcorrTable->Nimage);
     163  gfits_table_set_FlatCorrectionImage (&ftableImage, image, flatcorrTable->Nimage, TRUE);
    164164
    165165  ftableCorr.header = &theaderCorr;
    166   gfits_table_set_FlatCorrection (&ftableCorr, corr, flatcorrTable->Ncorr);
     166  gfits_table_set_FlatCorrection (&ftableCorr, corr, flatcorrTable->Ncorr, TRUE);
    167167
    168168  f = fopen (filename, "w");

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

    r38344 r38345  
    9999  gfits_print (&header, "HOSTS", "%s", 1, skytable->hosts);
    100100
    101   gfits_table_set_SkyRegion (&ftable, skytable[0].regions, skytable[0].Nregions);
     101  gfits_table_set_SkyRegion (&ftable, skytable[0].regions, skytable[0].Nregions, TRUE);
    102102
    103103  f = fopen (filename, "w");

  • branches/eam_branches/ohana.20150429/src/mosastro/src/wfits.c

    r27435 r38345  
    1919   
    2020  table.header = &theader;
    21   gfits_table_set_SMPData (&table, stars, Nstars);
     21  gfits_table_set_SMPData (&table, stars, Nstars, TRUE);
    2222
    2323  gfits_write_header  (filename, header);
Note: See TracChangeset for help on using the changeset viewer.