IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 5, 2006, 5:44:26 PM (20 years ago)
Author:
eugene
Message:

big move: fits_ to gfits_; minor updates to relphot

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r6683 r7080  
    1919
    2020  /* convert to the internal format */
    21   if (!fits_scan (ftable[0].header, "EXTNAME", "%s", 1, extname)) {
     21  if (!gfits_scan (ftable[0].header, "EXTNAME", "%s", 1, extname)) {
    2222    fprintf (stderr, "EXTNAME missing for average table\n");
    2323    return (FALSE);
    2424  }
    2525  if (!strcmp (extname, "DVO_AVERAGE")) {
    26     average = fits_table_get_Average (ftable, Naverage, NULL);
     26    average = gfits_table_get_Average (ftable, Naverage, NULL);
    2727    *format = DVO_FORMAT_INTERNAL;
    2828    return (average);
    … …  
    3030  if (!strcmp (extname, "DVO_AVERAGE_ELIXIR")) {
    3131    AverageElixir *tmpAverage;
    32     tmpAverage = fits_table_get_AverageElixir (ftable, Naverage, NULL);
     32    tmpAverage = gfits_table_get_AverageElixir (ftable, Naverage, NULL);
    3333    average = AverageElixirToInternal (tmpAverage, *Naverage);
    3434    free (tmpAverage);
    … …  
    3838  if (!strcmp (extname, "DVO_AVERAGE_LONEOS")) {
    3939    AverageLoneos *tmpAverage;
    40     tmpAverage = fits_table_get_AverageLoneos (ftable, Naverage, NULL);
     40    tmpAverage = gfits_table_get_AverageLoneos (ftable, Naverage, NULL);
    4141    average = AverageLoneosToInternal (tmpAverage, *Naverage);
    4242    free (tmpAverage);
    … …  
    4646  if (!strcmp (extname, "DVO_AVERAGE_PANSTARRS")) {
    4747    AveragePanstarrs *tmpAverage;
    48     tmpAverage = fits_table_get_AveragePanstarrs (ftable, Naverage, NULL);
     48    tmpAverage = gfits_table_get_AveragePanstarrs (ftable, Naverage, NULL);
    4949    average = AveragePanstarrsToInternal (tmpAverage, *Naverage);
    5050    free (tmpAverage);
    … …  
    5454  if (!strcmp (extname, "DVO_AVERAGE_PMTEST")) {
    5555    AveragePMtest *tmpAverage;
    56     tmpAverage = fits_table_get_AveragePMtest (ftable, Naverage, NULL);
     56    tmpAverage = gfits_table_get_AveragePMtest (ftable, Naverage, NULL);
    5757    average = AveragePMtestToInternal (tmpAverage, *Naverage);
    5858    free (tmpAverage);
    … …  
    7777  switch (format) {
    7878    case DVO_FORMAT_INTERNAL:
    79       fits_table_set_Average (ftable, average, Naverage);
     79      gfits_table_set_Average (ftable, average, Naverage);
    8080      break;
    8181    case DVO_FORMAT_ELIXIR:
    8282      tmpAverageElixir = AverageInternalToElixir (average, Naverage);
    83       fits_table_set_AverageElixir (ftable, tmpAverageElixir, Naverage);
     83      gfits_table_set_AverageElixir (ftable, tmpAverageElixir, Naverage);
    8484      free (tmpAverageElixir);
    8585      break;
    8686    case DVO_FORMAT_LONEOS:
    8787      tmpAverageLoneos  = AverageInternalToLoneos (average, Naverage);
    88       fits_table_set_AverageLoneos (ftable, tmpAverageLoneos , Naverage);
     88      gfits_table_set_AverageLoneos (ftable, tmpAverageLoneos , Naverage);
    8989      free (tmpAverageLoneos );
    9090      break;
    9191    case DVO_FORMAT_PANSTARRS:
    9292      tmpAveragePanstarrs = AverageInternalToPanstarrs (average, Naverage);
    93       fits_table_set_AveragePanstarrs (ftable, tmpAveragePanstarrs, Naverage);
     93      gfits_table_set_AveragePanstarrs (ftable, tmpAveragePanstarrs, Naverage);
    9494      free (tmpAveragePanstarrs);
    9595      break;
    9696    case DVO_FORMAT_PMTEST:
    9797      tmpAveragePMtest = AverageInternalToPMtest (average, Naverage);
    98       fits_table_set_AveragePMtest (ftable, tmpAveragePMtest, Naverage);
     98      gfits_table_set_AveragePMtest (ftable, tmpAveragePMtest, Naverage);
    9999      free (tmpAveragePMtest);
    100100      break;
    … …  
    114114
    115115  /* convert to the internal format */
    116   if (!fits_scan (ftable[0].header, "EXTNAME", "%s", 1, extname)) {
     116  if (!gfits_scan (ftable[0].header, "EXTNAME", "%s", 1, extname)) {
    117117    fprintf (stderr, "EXTNAME missing for measure table\n");
    118118    return (FALSE);
    119119  }
    120120  if (!strcmp (extname, "DVO_MEASURE")) {
    121     measure = fits_table_get_Measure (ftable, Nmeasure, NULL);
     121    measure = gfits_table_get_Measure (ftable, Nmeasure, NULL);
    122122    *format = DVO_FORMAT_INTERNAL;
    123123    return (measure);
    … …  
    125125  if (!strcmp (extname, "DVO_MEASURE_ELIXIR")) {
    126126    MeasureElixir *tmpMeasure;
    127     tmpMeasure = fits_table_get_MeasureElixir (ftable, Nmeasure, NULL);
     127    tmpMeasure = gfits_table_get_MeasureElixir (ftable, Nmeasure, NULL);
    128128    measure = MeasureElixirToInternal (tmpMeasure, *Nmeasure);
    129129    free (tmpMeasure);
    … …  
    133133  if (!strcmp (extname, "DVO_MEASURE_LONEOS")) {
    134134    MeasureLoneos *tmpMeasure;
    135     tmpMeasure = fits_table_get_MeasureLoneos (ftable, Nmeasure, NULL);
     135    tmpMeasure = gfits_table_get_MeasureLoneos (ftable, Nmeasure, NULL);
    136136    measure = MeasureLoneosToInternal (tmpMeasure, *Nmeasure);
    137137    free (tmpMeasure);
    … …  
    141141  if (!strcmp (extname, "DVO_MEASURE_PANSTARRS") || !strcmp (extname, "DVO_MEASURE_PMTEST")) {
    142142    MeasurePanstarrs *tmpMeasure;
    143     tmpMeasure = fits_table_get_MeasurePanstarrs (ftable, Nmeasure, NULL);
     143    tmpMeasure = gfits_table_get_MeasurePanstarrs (ftable, Nmeasure, NULL);
    144144    measure = MeasurePanstarrsToInternal (tmpMeasure, *Nmeasure);
    145145    free (tmpMeasure);
    … …  
    163163  switch (format) {
    164164    case DVO_FORMAT_INTERNAL:
    165       fits_table_set_Measure (ftable, measure, Nmeasure);
     165      gfits_table_set_Measure (ftable, measure, Nmeasure);
    166166      break;
    167167    case DVO_FORMAT_ELIXIR:
    168168      tmpMeasureElixir = MeasureInternalToElixir (measure, Nmeasure);
    169       fits_table_set_MeasureElixir (ftable, tmpMeasureElixir, Nmeasure);
     169      gfits_table_set_MeasureElixir (ftable, tmpMeasureElixir, Nmeasure);
    170170      free (tmpMeasureElixir);
    171171      break;
    172172    case DVO_FORMAT_LONEOS:
    173173      tmpMeasureLoneos = MeasureInternalToLoneos (measure, Nmeasure);
    174       fits_table_set_MeasureLoneos (ftable, tmpMeasureLoneos, Nmeasure);
     174      gfits_table_set_MeasureLoneos (ftable, tmpMeasureLoneos, Nmeasure);
    175175      free (tmpMeasureLoneos);
    176176      break;
    … …  
    178178    case DVO_FORMAT_PMTEST:
    179179      tmpMeasurePanstarrs = MeasureInternalToPanstarrs (measure, Nmeasure);
    180       fits_table_set_MeasurePanstarrs (ftable, tmpMeasurePanstarrs, Nmeasure);
     180      gfits_table_set_MeasurePanstarrs (ftable, tmpMeasurePanstarrs, Nmeasure);
    181181      free (tmpMeasurePanstarrs);
    182182      break;
    … …  
    196196
    197197  /* convert to the internal format */
    198   if (!fits_scan (ftable[0].header, "EXTNAME", "%s", 1, extname)) {
     198  if (!gfits_scan (ftable[0].header, "EXTNAME", "%s", 1, extname)) {
    199199    fprintf (stderr, "EXTNAME missing for secfilt table\n");
    200200    return (FALSE);
    201201  }
    202202  if (!strcmp (extname, "DVO_SECFILT")) {
    203     secfilt = fits_table_get_SecFilt (ftable, Nsecfilt, NULL);
     203    secfilt = gfits_table_get_SecFilt (ftable, Nsecfilt, NULL);
    204204    *format = DVO_FORMAT_INTERNAL;
    205205    return (secfilt);
    … …  
    207207  if (!strcmp (extname, "DVO_SECFILT_ELIXIR")) {
    208208    SecFiltElixir *tmpSecFilt;
    209     tmpSecFilt = fits_table_get_SecFiltElixir (ftable, Nsecfilt, NULL);
     209    tmpSecFilt = gfits_table_get_SecFiltElixir (ftable, Nsecfilt, NULL);
    210210    secfilt = SecFiltElixirToInternal (tmpSecFilt, *Nsecfilt);
    211211    free (tmpSecFilt);
    … …  
    215215  if (!strcmp (extname, "DVO_SECFILT_LONEOS")) {
    216216    SecFiltLoneos *tmpSecFilt;
    217     tmpSecFilt = fits_table_get_SecFiltLoneos (ftable, Nsecfilt, NULL);
     217    tmpSecFilt = gfits_table_get_SecFiltLoneos (ftable, Nsecfilt, NULL);
    218218    secfilt = SecFiltLoneosToInternal (tmpSecFilt, *Nsecfilt);
    219219    free (tmpSecFilt);
    … …  
    223223  if (!strcmp (extname, "DVO_SECFILT_PANSTARRS") || !strcmp (extname, "DVO_SECFILT_PMTEST")) {
    224224    SecFiltPanstarrs *tmpSecFilt;
    225     tmpSecFilt = fits_table_get_SecFiltPanstarrs (ftable, Nsecfilt, NULL);
     225    tmpSecFilt = gfits_table_get_SecFiltPanstarrs (ftable, Nsecfilt, NULL);
    226226    secfilt = SecFiltPanstarrsToInternal (tmpSecFilt, *Nsecfilt);
    227227    free (tmpSecFilt);
    … …  
    245245  switch (format) {
    246246    case DVO_FORMAT_INTERNAL:
    247       fits_table_set_SecFilt (ftable, secfilt, Nsecfilt);
     247      gfits_table_set_SecFilt (ftable, secfilt, Nsecfilt);
    248248      break;
    249249    case DVO_FORMAT_ELIXIR:
    250250      tmpSecFiltElixir = SecFiltInternalToElixir (secfilt, Nsecfilt);
    251       fits_table_set_SecFiltElixir (ftable, tmpSecFiltElixir, Nsecfilt);
     251      gfits_table_set_SecFiltElixir (ftable, tmpSecFiltElixir, Nsecfilt);
    252252      free (tmpSecFiltElixir);
    253253      break;
    254254    case DVO_FORMAT_LONEOS:
    255255      tmpSecFiltLoneos = SecFiltInternalToLoneos (secfilt, Nsecfilt);
    256       fits_table_set_SecFiltLoneos (ftable, tmpSecFiltLoneos, Nsecfilt);
     256      gfits_table_set_SecFiltLoneos (ftable, tmpSecFiltLoneos, Nsecfilt);
    257257      free (tmpSecFiltLoneos);
    258258      break;
    … …  
    260260    case DVO_FORMAT_PMTEST:
    261261      tmpSecFiltPanstarrs = SecFiltInternalToPanstarrs (secfilt, Nsecfilt);
    262       fits_table_set_SecFiltPanstarrs (ftable, tmpSecFiltPanstarrs, Nsecfilt);
     262      gfits_table_set_SecFiltPanstarrs (ftable, tmpSecFiltPanstarrs, Nsecfilt);
    263263      free (tmpSecFiltPanstarrs);
    264264      break;
    … …  
    280280  if (*format == DVO_FORMAT_ELIXIR) {
    281281    ImageElixir *tmpimage;
    282     tmpimage = fits_table_get_ImageElixir (ftable, &Nimage, NULL);
     282    tmpimage = gfits_table_get_ImageElixir (ftable, &Nimage, NULL);
    283283    ftable[0].buffer = (char *) ImageElixirToInternal (tmpimage, Nimage);
    284284    free (tmpimage);
    … …  
    287287
    288288  /* convert to the internal format */
    289   if (!fits_scan (ftable[0].header, "EXTNAME", "%s", 1, extname)) {
     289  if (!gfits_scan (ftable[0].header, "EXTNAME", "%s", 1, extname)) {
    290290    fprintf (stderr, "EXTNAME missing for image table\n");
    291291    return (FALSE);
    … …  
    293293  if (!strcmp (extname, "DVO_IMAGE")) {
    294294    Image *image;
    295     image = fits_table_get_Image (ftable, &Nimage, NULL);
     295    image = gfits_table_get_Image (ftable, &Nimage, NULL);
    296296    *format = DVO_FORMAT_INTERNAL;
    297297    return (TRUE);
    … …  
    300300    ImageElixir *tmpimage;
    301301    *format = DVO_FORMAT_ELIXIR;
    302     tmpimage = fits_table_get_ImageElixir (ftable, &Nimage, NULL);
     302    tmpimage = gfits_table_get_ImageElixir (ftable, &Nimage, NULL);
    303303    ftable[0].buffer = (char *) ImageElixirToInternal (tmpimage, Nimage);
    304304    free (tmpimage);
    … …  
    308308    ImageLoneos *tmpimage;
    309309    *format = DVO_FORMAT_LONEOS;
    310     tmpimage = fits_table_get_ImageLoneos (ftable, &Nimage, NULL);
     310    tmpimage = gfits_table_get_ImageLoneos (ftable, &Nimage, NULL);
    311311    ftable[0].buffer = (char *) ImageLoneosToInternal (tmpimage, Nimage);
    312312    free (tmpimage);
    … …  
    316316    ImagePanstarrs *tmpimage;
    317317    *format = DVO_FORMAT_PANSTARRS;
    318     tmpimage = fits_table_get_ImagePanstarrs (ftable, &Nimage, NULL);
     318    tmpimage = gfits_table_get_ImagePanstarrs (ftable, &Nimage, NULL);
    319319    ftable[0].buffer = (char *) ImagePanstarrsToInternal (tmpimage, Nimage);
    320320    free (tmpimage);
    … …  
    325325
    326326set_header:
    327   fits_free_header (theader);
    328   fits_table_mkheader_Image (theader);
    329   fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     327  gfits_free_header (theader);
     328  gfits_table_mkheader_Image (theader);
     329  gfits_modify (theader, "NAXIS2", "%d", 1, Nimage);
    330330  theader[0].Naxis[1] = Nimage;
    331   ftable[0].size = fits_matrix_size (theader);
     331  ftable[0].size = gfits_matrix_size (theader);
    332332  return (TRUE);
    333333}
    … …  
    345345  switch (format) {
    346346    case DVO_FORMAT_INTERNAL:
    347       fits_convert_Image ((Image *) ftable[0].buffer, sizeof(Image), Nimage);
     347      gfits_convert_Image ((Image *) ftable[0].buffer, sizeof(Image), Nimage);
    348348      break;
    349349    case DVO_FORMAT_ELIXIR:
    350350      tmpImageElixir = ImageInternalToElixir ((Image *) ftable[0].buffer, Nimage);
    351351      free (ftable[0].buffer);
    352       fits_table_set_ImageElixir (ftable, tmpImageElixir, Nimage);
     352      gfits_table_set_ImageElixir (ftable, tmpImageElixir, Nimage);
    353353      free (tmpImageElixir);
    354354      break;
    … …  
    356356      tmpImageLoneos = ImageInternalToLoneos ((Image *) ftable[0].buffer, Nimage);
    357357      free (ftable[0].buffer);
    358       fits_table_set_ImageLoneos (ftable, tmpImageLoneos, Nimage);
     358      gfits_table_set_ImageLoneos (ftable, tmpImageLoneos, Nimage);
    359359      free (tmpImageLoneos);
    360360      break;
    … …  
    363363      tmpImagePanstarrs = ImageInternalToPanstarrs ((Image *) ftable[0].buffer, Nimage);
    364364      free (ftable[0].buffer);
    365       fits_table_set_ImagePanstarrs (ftable, tmpImagePanstarrs, Nimage);
     365      gfits_table_set_ImagePanstarrs (ftable, tmpImagePanstarrs, Nimage);
    366366      free (tmpImagePanstarrs);
    367367      break;
    … …  
    386386    case DVO_FORMAT_INTERNAL:
    387387      for (i = 0; i < Nrow; i++) {
    388         fits_convert_Image ((Image *) vtable[0].buffer[i], sizeof(Image), 1);
     388        gfits_convert_Image ((Image *) vtable[0].buffer[i], sizeof(Image), 1);
    389389      }
    390390      return (TRUE);
    … …  
    393393      for (i = 0; i < Nrow; i++) {
    394394        tmpImageElixir = ImageInternalToElixir ((Image *) vtable[0].buffer[i], 1);
    395         fits_convert_ImageElixir (tmpImageElixir, sizeof(ImageElixir), 1);
     395        gfits_convert_ImageElixir (tmpImageElixir, sizeof(ImageElixir), 1);
    396396        free (vtable[0].buffer[i]);
    397397        vtable[0].buffer[i] = (char *) tmpImageElixir;
    … …  
    399399
    400400      /* convert header from old format to new format */
    401       fits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
    402 
    403       fits_free_header (theader);
    404       fits_table_mkheader_ImageElixir (theader);
    405 
    406       fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     401      gfits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
     402
     403      gfits_free_header (theader);
     404      gfits_table_mkheader_ImageElixir (theader);
     405
     406      gfits_modify (theader, "NAXIS2", "%d", 1, Nimage);
    407407      theader[0].Naxis[1] = Nimage;
    408       vtable[0].size = fits_matrix_size (theader);
     408      vtable[0].size = gfits_matrix_size (theader);
    409409      return (TRUE);
    410410    case DVO_FORMAT_LONEOS:
    … …  
    412412      for (i = 0; i < Nrow; i++) {
    413413        tmpImageLoneos = ImageInternalToLoneos ((Image *) vtable[0].buffer[i], 1);
    414         fits_convert_ImageLoneos (tmpImageLoneos, sizeof(ImageLoneos), 1);
     414        gfits_convert_ImageLoneos (tmpImageLoneos, sizeof(ImageLoneos), 1);
    415415        free (vtable[0].buffer[i]);
    416416        vtable[0].buffer[i] = (char *) tmpImageLoneos;
    … …  
    418418
    419419      /* convert header from old format to new format */
    420       fits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
    421 
    422       fits_free_header (theader);
    423       fits_table_mkheader_ImageLoneos (theader);
    424 
    425       fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     420      gfits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
     421
     422      gfits_free_header (theader);
     423      gfits_table_mkheader_ImageLoneos (theader);
     424
     425      gfits_modify (theader, "NAXIS2", "%d", 1, Nimage);
    426426      theader[0].Naxis[1] = Nimage;
    427       vtable[0].size = fits_matrix_size (theader);
     427      vtable[0].size = gfits_matrix_size (theader);
    428428      return (TRUE);
    429429    case DVO_FORMAT_PANSTARRS:
    … …  
    431431      for (i = 0; i < Nrow; i++) {
    432432        tmpImagePanstarrs = ImageInternalToPanstarrs ((Image *) vtable[0].buffer[i], 1);
    433         fits_convert_ImagePanstarrs (tmpImagePanstarrs, sizeof(ImagePanstarrs), 1);
     433        gfits_convert_ImagePanstarrs (tmpImagePanstarrs, sizeof(ImagePanstarrs), 1);
    434434        free (vtable[0].buffer[i]);
    435435        vtable[0].buffer[i] = (char *) tmpImagePanstarrs;
    … …  
    437437
    438438      /* convert header from old format to new format */
    439       fits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
    440       fits_free_header (theader);
    441       fits_table_mkheader_ImagePanstarrs (theader);
    442       fits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     439      gfits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
     440      gfits_free_header (theader);
     441      gfits_table_mkheader_ImagePanstarrs (theader);
     442      gfits_modify (theader, "NAXIS2", "%d", 1, Nimage);
    443443      theader[0].Naxis[1] = Nimage;
    444       vtable[0].size = fits_matrix_size (theader);
     444      vtable[0].size = gfits_matrix_size (theader);
    445445      return (TRUE);
    446446    default:
Note: See TracChangeset for help on using the changeset viewer.