Index: unk/Ohana/src/addstar/def/AddstarClientOptions.d =================================================================== --- /trunk/Ohana/src/addstar/def/AddstarClientOptions.d (revision 5285) +++ (revision ) @@ -1,18 +1,0 @@ -STRUCT AddstarClientOptions -EXTNAME OPTIONS -TYPE BINTABLE -SIZE 52 - -FIELD mode, MODE, int, data source mode -FIELD existing_regions, EXISTING_REGIONS, int, use only existing regions -FIELD only_match, ONLY_MATCH, int, only update matched stars -FIELD skip_missed, SKIP_MISSED, int, . -FIELD replace, REPLACE, int, . -FIELD closest, CLOSEST, int, . -FIELD nosort, NOSORT, int, . -FIELD update, UPDATE, int, . -FIELD only_images, ONLY_IMAGES, int, . -FIELD calibrate, CALIBRATE, int, . -FIELD mosaic, MOSAIC, int, does this image require a mosaic coordinate system? -FIELD photcode, PHOTCODE, int, photocode of input data -FIELD timeref, TIMEREF, e_time, time/date of input data (REFLIST only?) Index: unk/Ohana/src/addstar/def/Stars.d =================================================================== --- /trunk/Ohana/src/addstar/def/Stars.d (revision 5285) +++ (revision ) @@ -1,21 +1,0 @@ -STRUCT Stars -EXTNAME STARS -TYPE BINTABLE -SIZE 107 - -FIELD X, X, double, x coordinate on image -FIELD Y, Y, double, y coordinate on image -FIELD R, R, double, ra coordinate on sky -FIELD D, D, double, dec coordinate on sky -FIELD M, M, double, instrumental mag -FIELD dM, DM, double, error on mag -FIELD dophot, DOPHOT, char, dophot type code -FIELD sky, SKY, double, local sky counts -FIELD fx, FX, double, object FWHM x-dir -FIELD fy, FY, double, object FWHM y-dir -FIELD df, DF, double, object position angle -FIELD Mgal, MGAL, double, alternative (galaxy) magnitude -FIELD Map, MAP, double, alternative (aperture) magnitude -FIELD found, FOUND, int, found in database catalog? -FIELD code, CODE, short, . -FIELD t, T, e_time, date/time of exposure (UNIX) Index: unk/Ohana/src/addstar/def/commcode.c =================================================================== --- /trunk/Ohana/src/addstar/def/commcode.c (revision 5285) +++ (revision ) @@ -1,65 +1,0 @@ -# include "commbase.h" - -void byteswap_$STRUCT ($STRUCT *data) { - - int i; - unsigned char *byte, tmp; - - i = 0; // dummy usage in case !defined(BYTE_SWAP) - byte = (char *) data; - -# ifdef BYTE_SWAP - /** BYTE SWAP **/ -# endif - -} - -int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy) { - - int Nbytes; - $STRUCT *tmpdata; - - Nbytes = Ndata * sizeof ($STRUCT); - - if (copy) { - ALLOCATE (tmpdata, $STRUCT, Ndata); - memcpy (tmpdata, data, Nbytes); - } else { - tmpdata = data; - } - - byteswap_$STRUCT (tmpdata); - - SendCommand (device, 16, "NVALUE: %6d", Ndata); - SendCommand (device, 16, "NBYTES: %6d", Nbytes); - write (device, tmpdata, Nbytes); - - /* perform handshaking? */ - - return (TRUE); -} - -int Recv_$STRUCT (int device, $STRUCT **data, int *Ndata) { - - int ndata; - IOBuffer message; - $STRUCT *tmpdata; - - ExpectCommand (device, 16, 1.0, &message); - sscanf (message.buffer, "%*s %d", &ndata); - FreeIOBuffer (&message); - - /* what is reasonable for timeout? */ - ExpectMessage (device, 1.0, &message); - - tmpdata = ($STRUCT *) message.buffer; - byteswap_$STRUCT (tmpdata); - - /* double-check data length? */ - /* perform handshaking? */ - - *Ndata = ndata; - *data = tmpdata; - - return (TRUE); -} Index: unk/Ohana/src/addstar/def/commcode.h =================================================================== --- /trunk/Ohana/src/addstar/def/commcode.h (revision 5285) +++ (revision ) @@ -1,6 +1,0 @@ - -/** STRUCT DEFINITION **/ - -void byteswap_$STRUCT ($STRUCT *data); -int Send_$STRUCT (int device, $STRUCT *data, int Ndata, int copy); -int Recv_$STRUCT (int device, $STRUCT **data, int *Ndata); Index: unk/Ohana/src/addstar/def/common.h =================================================================== --- /trunk/Ohana/src/addstar/def/common.h (revision 5285) +++ (revision ) @@ -1,6 +1,0 @@ -# ifndef COMMCODE_H -# define COMMCODE_H -/* matched endif is added by Makefile */ - -# define e_time unsigned int - Index: unk/Ohana/src/addstar/include/base.h =================================================================== --- /trunk/Ohana/src/addstar/include/base.h (revision 5285) +++ (revision ) @@ -1,25 +1,0 @@ -# include - -/* socket / pipe communication buffer */ -typedef struct { - char *buffer; - int Nalloc; - int Nreset; - int Nblock; - int Nbuffer; -} IOBuffer; - -/* IO Buffer functions */ -int InitIOBuffer (IOBuffer *buffer, int Nalloc); -int FlushIOBuffer (IOBuffer *buffer); -int ReadtoIOBuffer (IOBuffer *buffer, int fd); -int EmptyIOBuffer (IOBuffer *buffer, int Nmax, int fd); -void FreeIOBuffer (IOBuffer *buffer); - -/* communication functions */ -int ExpectMessage (int device, double timeout, IOBuffer *message); -int ExpectCommand (int device, int length, double timeout, IOBuffer *buffer); -int SendMessage (int device, char *format, ...); -int SendCommand (int device, int length, char *format, ...); -int SendCommandV (int device, int length, char *format, va_list argp); - Index: unk/Ohana/src/addstar/include/commbase.h =================================================================== --- /trunk/Ohana/src/addstar/include/commbase.h (revision 5285) +++ (revision ) @@ -1,35 +1,0 @@ -# include "base.h" - -# define SWAP_BYTE(X) \ - tmp = byte[X+0]; byte[X+0] = byte[X+1]; byte[X+1] = tmp; -# define SWAP_WORD(X) \ - tmp = byte[X+0]; byte[X+0] = byte[X+3]; byte[X+3] = tmp; \ - tmp = byte[X+1]; byte[X+1] = byte[X+2]; byte[X+2] = tmp; -# define SWAP_DBLE(X) \ - tmp = byte[X+0]; byte[X+0] = byte[X+7]; byte[X+7] = tmp; \ - tmp = byte[X+1]; byte[X+1] = byte[X+6]; byte[X+6] = tmp; \ - tmp = byte[X+2]; byte[X+2] = byte[X+5]; byte[X+5] = tmp; \ - tmp = byte[X+3]; byte[X+3] = byte[X+4]; byte[X+4] = tmp; - -# ifdef linux -# define BYTE_SWAP -# endif - -# ifdef sid -# define BYTE_SWAP -# endif - -# ifdef dec -# define BYTE_SWAP -# endif - -/*** this file uses data types which must have fixed sizes regardless - of the platform. It originally used the basic C primitives: - float, double, int, short int, unsigned long int, etc. - this breaks under 64 bit (and probably on other systems). - I should define internal data types which should be set by the - use of # define statements if needed. I will cheat for now and use - the time_t to replace unsigned long int in this file -***/ - -# include "commcode.h" Index: unk/Ohana/src/addstar/include/commcode.h =================================================================== --- /trunk/Ohana/src/addstar/include/commcode.h (revision 5285) +++ (revision ) @@ -1,52 +1,0 @@ -# ifndef COMMCODE_H -# define COMMCODE_H -/* matched endif is added by Makefile */ - -# define e_time unsigned int - - -/** STRUCT DEFINITION **/ -typedef struct { - int mode; // data source mode - int existing_regions; // use only existing regions - int only_match; // only update matched stars - int skip_missed; // . - int replace; // . - int closest; // . - int nosort; // . - int update; // . - int only_images; // . - int calibrate; // . - int mosaic; // does this image require a mosaic coordinate system? - int photcode; // photocode of input data - e_time timeref; // time/date of input data (REFLIST only?) -} AddstarClientOptions; - -void byteswap_AddstarClientOptions (AddstarClientOptions *data); -int Send_AddstarClientOptions (int device, AddstarClientOptions *data, int Ndata, int copy); -int Recv_AddstarClientOptions (int device, AddstarClientOptions **data, int *Ndata); - -/** STRUCT DEFINITION **/ -typedef struct { - double X; // x coordinate on image - double Y; // y coordinate on image - double R; // ra coordinate on sky - double D; // dec coordinate on sky - double M; // instrumental mag - double dM; // error on mag - char dophot; // dophot type code - double sky; // local sky counts - double fx; // object FWHM x-dir - double fy; // object FWHM y-dir - double df; // object position angle - double Mgal; // alternative (galaxy) magnitude - double Map; // alternative (aperture) magnitude - int found; // found in database catalog? - short code; // . - e_time t; // date/time of exposure (UNIX) -} Stars; - -void byteswap_Stars (Stars *data); -int Send_Stars (int device, Stars *data, int Ndata, int copy); -int Recv_Stars (int device, Stars **data, int *Ndata); -# endif