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

Location:
trunk/Ohana/src/libautocode
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libautocode/def/autocode.c

    r5851 r7080  
    11# include "autocode.h"
    22
    3 int fits_convert_$STRUCT ($STRUCT *data, int size, int nitems) {
     3int gfits_convert_$STRUCT ($STRUCT *data, int size, int nitems) {
    44
    55  int i;
    … …  
    2828/*** add test of EXTNAME and header-defined columns? ***/
    2929/* return internal structure representation */
    30 $STRUCT *fits_table_get_$STRUCT (FTable *ftable, int *Ndata, int *swapped) {
     30$STRUCT *gfits_table_get_$STRUCT (FTable *ftable, int *Ndata, int *swapped) {
    3131
    3232  $STRUCT *data;
    … …  
    3535  data = ($STRUCT *) ftable[0].buffer;
    3636  if ((swapped == NULL) || (*swapped == FALSE)) {
    37     fits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata);
     37    gfits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata);
    3838    if (swapped != NULL) *swapped = TRUE;
    3939  }
    … …  
    4141}
    4242
    43 int fits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, int Ndata) {
     43int gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, int Ndata) {
    4444
    4545  Header *header;
    … …  
    4848
    4949  /* create table header */
    50   fits_create_table_header (header, "$TYPE", "$EXTNAME");
     50  gfits_create_table_header (header, "$TYPE", "$EXTNAME");
    5151
    5252  /* define table layout */
    … …  
    5454
    5555  /* create table */
    56   fits_create_table (header, ftable);
     56  gfits_create_table (header, ftable);
    5757
    5858  /* add data values */
    59   fits_convert_$STRUCT (data, sizeof ($STRUCT), Ndata);
    60   fits_add_rows (ftable, (char *) data, Ndata, sizeof ($STRUCT));
     59  gfits_convert_$STRUCT (data, sizeof ($STRUCT), Ndata);
     60  gfits_add_rows (ftable, (char *) data, Ndata, sizeof ($STRUCT));
    6161
    6262  return (TRUE);
    6363}
    6464
    65 int fits_table_mkheader_$STRUCT (Header *header) {
     65int gfits_table_mkheader_$STRUCT (Header *header) {
    6666
    6767  /* create table header */
    68   fits_create_table_header (header, "$TYPE", "$EXTNAME");
     68  gfits_create_table_header (header, "$TYPE", "$EXTNAME");
    6969
    7070  /* define table layout */
    … …  
    8888  }
    8989
    90   fits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), Ndata);
     90  gfits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), Ndata);
    9191
    9292  SendCommand (device, 16, "NVALUE: %6d", Ndata);
    … …  
    113113 
    114114  tmpdata = ($STRUCT *) message.buffer;
    115   fits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), ndata);
     115  gfits_convert_$STRUCT (tmpdata, sizeof ($STRUCT), ndata);
    116116
    117117  /* double-check data length? */

  • trunk/Ohana/src/libautocode/def/autocode.h

    r5273 r7080  
    22/** STRUCT DEFINITION **/
    33
    4 $STRUCT *fits_table_get_$STRUCT (FTable *table, int *Ndata, int *swapped);
    5 int      fits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, int Ndata);
    6 int      fits_table_mkheader_$STRUCT (Header *header);
    7 int      fits_convert_$STRUCT ($STRUCT *data, int size, int nitems);
     4$STRUCT *gfits_table_get_$STRUCT (FTable *table, int *Ndata, int *swapped);
     5int      gfits_table_set_$STRUCT (FTable *ftable, $STRUCT *data, int Ndata);
     6int      gfits_table_mkheader_$STRUCT (Header *header);
     7int      gfits_convert_$STRUCT ($STRUCT *data, int size, int nitems);
    88int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy);
    99int Recv_$STRUCT (int device, $STRUCT **data, int *Ndata);

  • trunk/Ohana/src/libautocode/doc/ChangeLog.txt

    r6693 r7080  
     1
     2- libautocode 1.5
     3  * converted to gfits APIs (forces libfits 1.6)
     4  * fixed comma errors in average tables
    15
    26- libautocode 1.4

  • trunk/Ohana/src/libautocode/generate

    r6454 r7080  
    140140        }
    141141
    142         printf FILE "  fits_define_bintable_column (header, ";
     142        printf FILE "  gfits_define_bintable_column (header, ";
    143143        printf FILE "%-8s",               "\"$pt2\", ";
    144144        printf FILE "%-20s",              "\"$field[$i]\", ";
    … …  
    225225        if (!$pt1) { die "unknown type $type"; }
    226226
    227         printf FILE "  fits_define_table_column (header, ";
     227        printf FILE "  gfits_define_table_column (header, ";
    228228        printf FILE "%-8s",      "\"$pt1\", ";
    229229        printf FILE "%-20s",     "\"$field[$i]\", ";
Note: See TracChangeset for help on using the changeset viewer.