Index: trunk/Ohana/src/addstar/include/addstar.h =================================================================== --- trunk/Ohana/src/addstar/include/addstar.h (revision 21086) +++ trunk/Ohana/src/addstar/include/addstar.h (revision 21153) @@ -141,8 +141,8 @@ void FindCalibration PROTO((Image *image)); FILE *GetDB PROTO((int *state)); -void InitCalibration PROTO(()); +void InitCalibration PROTO((int mode)); void SaveCalibration PROTO((float Mo, float dMo, float Mr, float dMr, float Mi, int N)); void SetProtect PROTO((int mode)); -int SetSignals PROTO(()); +int SetSignals PROTO((void)); int Shutdown PROTO((char *message, ...); ) void TrapSignal PROTO((int sig)); @@ -177,5 +177,5 @@ int in_image PROTO((double r, double d, Image *image)); int load_pt_catalog PROTO((Catalog *catalog, SkyRegion *region)); /*** choose new name ***/ -void load_subpix PROTO(()); +void load_subpix PROTO((void)); void lock_image_db PROTO((FITS_DB *db, char *filename)); int main PROTO((int argc, char **argv)); @@ -238,6 +238,5 @@ SkyList *SkyListExistingSubset PROTO((SkyList *input, char *path)); int SkyListSetPath PROTO((SkyList *list, char *path)); -SkyTable *SkyTableLoadOptimal PROTO(()); -int InitDataset PROTO(()); +int InitDataset PROTO((void)); int PushDataset PROTO((DVO_DATA *data)); DVO_DATA *PopDataset PROTO((void)); Index: trunk/Ohana/src/addstar/include/sedstar.h =================================================================== --- trunk/Ohana/src/addstar/include/sedstar.h (revision 21086) +++ trunk/Ohana/src/addstar/include/sedstar.h (revision 21153) @@ -41,5 +41,5 @@ int SEDfitInit (SEDtable *table); int SEDfitPlot (SEDtable *table, double R, double D, SEDfit *minFit, SEDtableRow *sourceValue, SEDtableRow *sourceError); -int SEDfitClear (); +int SEDfitClear (void); int SEDfitCatalog (Catalog *outcat, Catalog *incat, SEDtable *table); void SetLimitsRaw (float *xvec, float *yvec, int Nelements, Graphdata *graphmode); Index: trunk/Ohana/src/addstar/include/skycells.h =================================================================== --- trunk/Ohana/src/addstar/include/skycells.h (revision 21086) +++ trunk/Ohana/src/addstar/include/skycells.h (revision 21153) @@ -76,5 +76,5 @@ void SetProtect PROTO((int mode)); -int SetSignals PROTO(()); +int SetSignals PROTO((void)); int Shutdown PROTO((char *message, ...); ) void TrapSignal PROTO((int sig)); Index: trunk/Ohana/src/addstar/src/addstarc.c =================================================================== --- trunk/Ohana/src/addstar/src/addstarc.c (revision 21086) +++ trunk/Ohana/src/addstar/src/addstarc.c (revision 21153) @@ -32,5 +32,7 @@ Send_Image (BindSocket, images, Nimages, FALSE); if (options.mosaic) { - GetRegisteredMosaic (&MOSAIC); + // XXX : this is broken due to an API mod for GetRegisteredMosaic + // GetRegisteredMosaic (&MOSAIC); + abort(); Send_Coords (BindSocket, &MOSAIC, 1, FALSE); } Index: trunk/Ohana/src/delstar/include/delstar.h =================================================================== --- trunk/Ohana/src/delstar/include/delstar.h (revision 21086) +++ trunk/Ohana/src/delstar/include/delstar.h (revision 21153) @@ -43,5 +43,5 @@ int SetImages PROTO((Image *new, int Nnew)); void SetProtect PROTO((int mode)); -int SetSignals PROTO(()); +int SetSignals PROTO((void)); int Shutdown PROTO((char *format, ...)); void TrapSignal PROTO((int sig)); @@ -59,5 +59,5 @@ Image *gimages PROTO((char *filename)); Image *gtimes PROTO((int *NIMAGE)); -void help PROTO(()); +void help PROTO((void)); int load_image_db PROTO((FITS_DB *db)); void lock_image_db PROTO((FITS_DB *db, char *filename)); @@ -65,8 +65,8 @@ double opening_angle PROTO((double x1, double y1, double x2, double y2, double x3, double y3)); int parse_time PROTO((Header *header)); -int save_image_db PROTO(()); +int save_image_db PROTO((void)); void sort_lists PROTO((float *X, float *Y, int *S, int N)); void unlock_image_db PROTO((FITS_DB *db)); -void usage PROTO(()); +void usage PROTO((void)); int wcatalog PROTO((Catalog *catalog)); Index: trunk/Ohana/src/dvosplit/include/dvosplit.h =================================================================== --- trunk/Ohana/src/dvosplit/include/dvosplit.h (revision 21086) +++ trunk/Ohana/src/dvosplit/include/dvosplit.h (revision 21153) @@ -32,5 +32,5 @@ int ConfigInit PROTO((int *argc, char **argv)); -int SetSignals PROTO(()); +int SetSignals PROTO((void)); void SetProtect PROTO((int mode)); void TrapSignal PROTO((int sig)); Index: trunk/Ohana/src/elixir/include/elixir.h =================================================================== --- trunk/Ohana/src/elixir/include/elixir.h (revision 21086) +++ trunk/Ohana/src/elixir/include/elixir.h (revision 21153) @@ -103,8 +103,8 @@ char *GetPhotcodeExt (char *file); char *GetPhotcodeMef (char *file); -Machine *GrabMachine (); -Cluster *InitCluster (); -Process *InitProcess (char *name, Queue *pending, Queue *failure, int (*mkargs)()); -Queue *InitQueue (); +Machine *GrabMachine (void); +Cluster *InitCluster (void); +Process *InitProcess (char *name, Queue *pending, Queue *failure, int (*mkargs)(void)); +Queue *InitQueue (void); FILE *LogOpen (char *filename); char *PathFilename (char *file); @@ -114,5 +114,5 @@ int CheckEndingState (Process *global, int Nobjects, int Dynamic); int CheckMachineStatus (Machine *machine); -int CheckMessages (); +int CheckMessages (void); int CheckProcess (Process *process); void CloseMachine (Machine *machine); @@ -124,10 +124,10 @@ int DumpProcessTimes (char *filename); int DumpStatus (char *filename); -void ElixirStop (); +void ElixirStop (void); int FlushFifo (Fifo *fifo); void FreeArgs (int argc, char **argv, int *argd); void FreeFifo (Fifo *fifo); -int GetDynamicState (); -double GetTimeout (); +int GetDynamicState (void); +double GetTimeout (void); void HaltElixir (char *pidfile); int HalttoRestart (char *pidfile); @@ -149,7 +149,7 @@ int ReadtoFifo (Fifo *fifo, int sock); void RegisterTimeout (double value); -void RemovePID (); +void RemovePID (void); void Restart (char **argv); -void RestartMachines (); +void RestartMachines (void); void SIG_DIE (int sig); void SIG_MESSAGE (int sig); @@ -157,5 +157,5 @@ void SIG_RELOAD (int sig); void SIG_STOP (int sig); -int SetExitTimer (); +int SetExitTimer (void); void SetMessageFile (char *filename); int ShiftFifo (Fifo *fifo); Index: trunk/Ohana/src/gastro/include/gastro.h =================================================================== --- trunk/Ohana/src/gastro/include/gastro.h (revision 21086) +++ trunk/Ohana/src/gastro/include/gastro.h (revision 21153) @@ -87,5 +87,5 @@ void PlotVector PROTO((int Npts, float *vect, int mode, int N)); void PrepPlotting PROTO((int Npts, Graphdata *graphmode, int N)); -void XDead PROTO(()); +void XDead PROTO((int value)); void alter_header PROTO((char *, char **, int, double, double, double, double, double, double, double, double, int)); void area_of_region PROTO((CatStats *region)); Index: trunk/Ohana/src/gastro/src/plotstuff.c =================================================================== --- trunk/Ohana/src/gastro/src/plotstuff.c (revision 21086) +++ trunk/Ohana/src/gastro/src/plotstuff.c (revision 21153) @@ -5,5 +5,5 @@ static int active; -void XDead () { +void XDead (int value) { signal (SIGPIPE, XDead); fprintf (stderr, "kapa is dead, must restart\n"); Index: trunk/Ohana/src/gastro2/include/gastro2.h =================================================================== --- trunk/Ohana/src/gastro2/include/gastro2.h (revision 21086) +++ trunk/Ohana/src/gastro2/include/gastro2.h (revision 21153) @@ -133,7 +133,7 @@ void PlotVector (int Npts, float *vect, int mode, int N); void PrepPlotting (int Npts, Graphdata *graphmode, int N); -void XDead (); +void XDead (int value); void add_to_regions (CatStats *area); -void ahelp (); +void ahelp (void); void area_of_region (CatStats *region); double area_of_skyregion (SkyRegion *region); @@ -147,8 +147,8 @@ int fit_adjust (Coords *coords); void fit_apply (double *x, double *y, double X, double Y); -void fit_eval (); +void fit_eval (void); void fit_init (int order); void fit_lum_bin (double *x, double *y, int N, double *C0, double *C1); -void fit_norm (); +void fit_norm (void); double fit_scat (StarData *st, StarData *sr, Coords *coords); int gaussj (double **a, int n, double **b, int m); @@ -166,10 +166,10 @@ void grid (CmpCatalog *Target, RefCatalog *Subset, Answer *answer); int gridbin (double dX, double dY); -void gridfree (); +void gridfree (void); void gridinit (double XMIN, double XMAX, double YMIN, double YMAX, int Nr, int Nt); void gstars (char *filename, CmpCatalog *Target); void hh_hms (double hh, int *hr, int *mn, double *sc); void hms_format (char *line, double value); -void init_regions (); +void init_regions (void); int load_ra_blocks (int Ndec, CatStats *area); int mk_polyterm (int n, int m, int norder); @@ -178,14 +178,14 @@ void pair_add (int i1, int i2); -void pair_init (); +void pair_init (void); int pair_lists (int **index1, int **index2); int parse_GSC_line (CatStats *tregion, char *line); int plot_addpt_gridplot (double x, double y); -void plot_done_gridplot (); +void plot_done_gridplot (void); void plot_fullfield (CmpCatalog *Target, RefCatalog *Ref); void plot_fullfield_pairs (float *x, float *y, int n); void plot_gridpts (double *pts, int Npts); -void plot_init_gridplot (); +void plot_init_gridplot (void); void plot_lumfunc (CmpCatalog *Target, RefCatalog *Ref); void plot_resid (StarData *st, StarData *sr, Coords *coords); Index: trunk/Ohana/src/gastro2/src/grid.c =================================================================== --- trunk/Ohana/src/gastro2/src/grid.c (revision 21086) +++ trunk/Ohana/src/gastro2/src/grid.c (revision 21153) @@ -96,5 +96,5 @@ if (PLOTSTUFF) plot_gridpts (N, Nbin); - if (PLOTSTUFF) plot_done_gridplot (dX, dY); + if (PLOTSTUFF) plot_done_gridplot (); XMIN -= 0.5*NGRID_PIX; Index: trunk/Ohana/src/gastro2/src/plots.c =================================================================== --- trunk/Ohana/src/gastro2/src/plots.c (revision 21086) +++ trunk/Ohana/src/gastro2/src/plots.c (revision 21153) @@ -5,5 +5,5 @@ Graphdata gv; -void plot_init_gridplot () { +void plot_init_gridplot (void) { NV = 1000; @@ -50,5 +50,5 @@ } -void plot_done_gridplot () { +void plot_done_gridplot (void) { char c; Index: trunk/Ohana/src/gastro2/src/plotstuff.c =================================================================== --- trunk/Ohana/src/gastro2/src/plotstuff.c (revision 21086) +++ trunk/Ohana/src/gastro2/src/plotstuff.c (revision 21153) @@ -5,5 +5,5 @@ static int active; -void XDead () { +void XDead (int value) { signal (SIGPIPE, XDead); fprintf (stderr, "kapa is dead, must restart\n"); Index: trunk/Ohana/src/gcompare/include/gcompare.h =================================================================== --- trunk/Ohana/src/gcompare/include/gcompare.h (revision 21086) +++ trunk/Ohana/src/gcompare/include/gcompare.h (revision 21153) @@ -23,5 +23,5 @@ /******* PROTOTYPES ***********/ -void help PROTO(()); +void help PROTO((void)); data_type input PROTO((char *, int, int, int)); match_type *compare PROTO((data_type, data_type, int *, double, double, double, double)); Index: trunk/Ohana/src/getstar/include/dvoImageExtract.h =================================================================== --- trunk/Ohana/src/getstar/include/dvoImageExtract.h (revision 21086) +++ trunk/Ohana/src/getstar/include/dvoImageExtract.h (revision 21153) @@ -24,5 +24,5 @@ void TrapSignal PROTO((int sig)); void SetProtect PROTO((int mode)); -int SetSignals PROTO(()); +int SetSignals PROTO((void)); int GetFileMode (Header *header); Index: trunk/Ohana/src/getstar/include/dvoImageOverlaps.h =================================================================== --- trunk/Ohana/src/getstar/include/dvoImageOverlaps.h (revision 21086) +++ trunk/Ohana/src/getstar/include/dvoImageOverlaps.h (revision 21153) @@ -27,5 +27,5 @@ void TrapSignal PROTO((int sig)); void SetProtect PROTO((int mode)); -int SetSignals PROTO(()); +int SetSignals PROTO((void)); Image *ReadImageFiles (char *filename, int *Nimages); Index: trunk/Ohana/src/getstar/include/getstar.h =================================================================== --- trunk/Ohana/src/getstar/include/getstar.h (revision 21086) +++ trunk/Ohana/src/getstar/include/getstar.h (revision 21153) @@ -46,5 +46,5 @@ void TrapSignal PROTO((int sig)); void SetProtect PROTO((int mode)); -int SetSignals PROTO(()); +int SetSignals PROTO((void)); int gcatalog PROTO((Catalog *catalog)); int write_catalog PROTO((Catalog *catalog)); Index: trunk/Ohana/src/gophot/include/prototypes.h =================================================================== --- trunk/Ohana/src/gophot/include/prototypes.h (revision 21086) +++ trunk/Ohana/src/gophot/include/prototypes.h (revision 21153) @@ -11,9 +11,9 @@ char *expandline (char *line, char *config); bool cosmic (float *star); -int dophot (); +int dophot (void); int ellipse (float, float, float, float *, float *, float *, float *); int errupd (float *, int); int fillerup (int, int, int); -float findsky (); +float findsky (void); bool galaxy (float *, float *, float *); float guess1 (float *, float *, int, int); @@ -22,19 +22,19 @@ int impaper2 (int); int improve (int); -int isearch (); +int isearch (void); void lubksb (float **, int, int *, float *); void ludcmp (float **, int, int *, float *); -int makemask (); -int makenoise (); +int makemask (void); +int makenoise (void); int mprint (int, char *, ...); int set_verbosity (int); -int completeout (); +int completeout (void); int oblims (float *, int *); bool oblit (float *); bool oblit (float *); -int paravg (); +int paravg (void); float parinterp (float, float, float *); int parupd (float *, float *, int, int); -int shape (); +int shape (void); int sort (float *, int); bool toobright (float *); @@ -42,5 +42,5 @@ bool transmask (int, int, float); float twofit (float *, float *, float *, float *); -int variparplane (); +int variparplane (void); bool offpic (float *, int, int, float *, float *); float newguess (float *, float *, int, int); Index: trunk/Ohana/src/imclean/include/imclean.h =================================================================== --- trunk/Ohana/src/imclean/include/imclean.h (revision 21086) +++ trunk/Ohana/src/imclean/include/imclean.h (revision 21153) @@ -46,5 +46,5 @@ void find_better_line (SMPData *stars, char *mark, int Npts, int i, double *M, double *B, int axis); -void help (); +void help (void); void args (int argc, char **argv); void wfits (char *filename, SMPData *stars, int Nstars, Header *header); Index: trunk/Ohana/src/imregister/include/detrend.h =================================================================== --- trunk/Ohana/src/imregister/include/detrend.h (revision 21086) +++ trunk/Ohana/src/imregister/include/detrend.h (revision 21153) @@ -74,6 +74,6 @@ DetReg DefineEntry (Descriptor descriptor); -char *set_dBFile (); -char *get_dBPath (); +char *set_dBFile (void); +char *get_dBPath (void); int delete_image (DetReg *image); @@ -94,5 +94,5 @@ Match SelectEntry (DetReg *image, int Nimage, Match *list, int Nlist, Criteria *crit); -int usage (); +int usage (void); Criteria *MosaicCriteria (Criteria base, char *filename, int *ncrit); Criteria *ImageCriteria (Criteria base, char *filename, char *ImageExtend, char *ImageMode, int *ncrit); @@ -105,5 +105,5 @@ int set_crit (Criteria *crit, DetReg *image); int ckpathname (char *newpath); -int PrintCriteria (); +int PrintCriteria (void); int SetAltpath (FITS_DB *db, DetReg *image, int Nimage, Match *match, int Nmatch); Index: trunk/Ohana/src/imregister/include/imreg.h =================================================================== --- trunk/Ohana/src/imregister/include/imreg.h (revision 21086) +++ trunk/Ohana/src/imregister/include/imreg.h (revision 21153) @@ -100,6 +100,6 @@ double SigmaClipList (double *list, int N); double MosaicIQStats (RegImage *image, int *match, int Nmatch, MosaicRegion *region); -MosaicLayout *CreateCFH12K (); -MosaicLayout *CreateMegaCam (); +MosaicLayout *CreateCFH12K (void); +MosaicLayout *CreateMegaCam (void); int GetREFCCD (RegImage *image, int *index, int *entry, int Nindex, int start); @@ -107,8 +107,8 @@ void SIG_DIE (int sig); void SIG_PIPE (int sig); -void SetSignals (); +void SetSignals (void); void KillProcess (char *pidfile); void StatusProcess (char *pidfile); -int close_lock_db (); +int close_lock_db (void); int ConfigPID (char *pidfile); int print_db_status (char *message); @@ -117,5 +117,5 @@ int LoadPID (char *file, pid_t *pid, char *username, char *machine); int Shutdown (int status); -void RemovePID (); +void RemovePID (void); int rconnect (char *hostname, char *command, int *rsock, int *wsock); Index: trunk/Ohana/src/imregister/include/imregister.h =================================================================== --- trunk/Ohana/src/imregister/include/imregister.h (revision 21086) +++ trunk/Ohana/src/imregister/include/imregister.h (revision 21153) @@ -78,8 +78,8 @@ void sortpair (int *X, int *Y, int N); -void ConfigCamera (); +void ConfigCamera (void); int MatchCCDNameHeader (Header *header); int MatchCCDName (char *ID); -void ConfigFilter (); +void ConfigFilter (void); int MatchFilterList (char *line); void ConfigInit (int *argc, char **argv); Index: trunk/Ohana/src/kapa/include/prototypes.h =================================================================== --- trunk/Ohana/src/kapa/include/prototypes.h (revision 21086) +++ trunk/Ohana/src/kapa/include/prototypes.h (revision 21153) @@ -4,5 +4,5 @@ void CheckFontName PROTO((int *, char **, char *)); void CheckGeometry PROTO((int *, char **)); -int CheckPipe PROTO(()); +int CheckPipe PROTO((void)); void CreateWindow PROTO((Window, int, long)); void DefineLayout PROTO((int, char **)); @@ -16,24 +16,24 @@ void DrawXErrors PROTO((Layout *, Gobjects *)); void DrawYErrors PROTO((Layout *, Gobjects *)); -int ErasePlot PROTO(()); +int ErasePlot PROTO((void)); unsigned long GetColor PROTO((Display *, char *, Colormap, unsigned long)); -int GetColormapSize PROTO(()); +int GetColormapSize PROTO((void)); char *GetRGBString PROTO((int N)); int InButton PROTO((XButtonEvent *, Button *)); int InPicture PROTO((XButtonEvent *, Picture *)); -int ListSection PROTO(()); -int LoadBox PROTO(()); +int ListSection PROTO((void)); +int LoadBox PROTO((void)); void LoadFont PROTO((int *, char **, char *)); -int LoadLabels PROTO(()); -int LoadObject PROTO(()); -int LoadPtext PROTO(()); +int LoadLabels PROTO((void)); +int LoadObject PROTO((void)); +int LoadPtext PROTO((void)); int LoadVectorData PROTO((Layout *, int, char *)); void MakeColormap PROTO((int, char **)); void MakeCursor PROTO((unsigned int)); -void MapWindow PROTO(()); +void MapWindow PROTO((void)); void NameWindow PROTO((char *)); Display *OpenDisplay PROTO((char *, int *)); -int PNGit PROTO(()); -int PPMit PROTO(()); +int PNGit PROTO((void)); +int PPMit PROTO((void)); void PSConnect PROTO((Layout *, Gobjects *, FILE *)); int PSFrame PROTO((Layout *, FILE *)); @@ -44,5 +44,5 @@ void PSXErrors PROTO((Layout *, Gobjects *, FILE *)); void PSYErrors PROTO((Layout *, Gobjects *, FILE *)); -int PSit PROTO(()); +int PSit PROTO((void)); void PositionPicture PROTO((Layout *)); void QuitX PROTO((Display *, char *, char *)); @@ -50,8 +50,8 @@ void Refresh PROTO((int)); void Remap PROTO((Layout *, Matrix *)); -int Resize PROTO(()); -int SetFont PROTO(()); -int SetLimits PROTO(()); -void SetNormalHints PROTO(()); +int Resize PROTO((void)); +int SetFont PROTO((void)); +int SetLimits PROTO((void)); +void SetNormalHints PROTO((void)); int SetSection PROTO((int SwitchSection)); void SetUpDisplay PROTO((int *, char **)); @@ -59,17 +59,17 @@ void SetWMHints PROTO((Icon *)); void TopWindow PROTO((Icon *)); -int cursor PROTO(()); +int cursor PROTO((void)); int get_argument PROTO((int, char **, char *)); void hh_hms PROTO((char *, double, double, char)); int remove_argument PROTO((int, int *, char **)); -void MakeGC (); +void MakeGC (void); -int EventLoop (); -void CloseDisplay (); +int EventLoop (void); +void CloseDisplay (void); int args (int *argc, char **argv); void DrawPtext (Layout *layout); -void FlushDisplay (); +void FlushDisplay (void); void AxisTickScale (Axis *axis, double *major, double *minor); void DrawFrame (Layout *layout); @@ -93,5 +93,5 @@ void bDrawPtext (Layout *layout); -bDrawBuffer *bDrawIt (); +bDrawBuffer *bDrawIt (void); /******************* XGRAPH ** Index: trunk/Ohana/src/kapa/include/structures.h =================================================================== --- trunk/Ohana/src/kapa/include/structures.h (revision 21086) +++ trunk/Ohana/src/kapa/include/structures.h (revision 21153) @@ -23,7 +23,7 @@ int width, height; char *bitmap; /* picture on button */ - int (*function_1) (); /* mouse_button 1 function */ - int (*function_2) (); /* mouse_button 2 function */ - int (*function_3) (); /* mouse_button 3 function */ + int (*function_1) (void); /* mouse_button 1 function */ + int (*function_2) (void); /* mouse_button 2 function */ + int (*function_3) (void); /* mouse_button 3 function */ } Button; @@ -35,5 +35,5 @@ int outline; /* draw an outline? */ int cursor; /* location of cursor (if selected) */ - int (*function) (); /* textline function */ + int (*function) (void); /* textline function */ } TextLine; @@ -48,5 +48,5 @@ int cursor_x; /* location of cursor (if selected) */ int cursor_y; /* location of cursor (if selected) */ - int (*function) (); /* textline function */ + int (*function) (void); /* textline function */ } TextBox; Index: trunk/Ohana/src/kapa2/include/kii.struct.h =================================================================== --- trunk/Ohana/src/kapa2/include/kii.struct.h (revision 21086) +++ trunk/Ohana/src/kapa2/include/kii.struct.h (revision 21153) @@ -29,7 +29,7 @@ int width, height; char *bitmap; /* picture on button */ - int (*function_1) (); /* mouse_button 1 function */ - int (*function_2) (); /* mouse_button 2 function */ - int (*function_3) (); /* mouse_button 3 function */ + int (*function_1) (void); /* mouse_button 1 function */ + int (*function_2) (void); /* mouse_button 2 function */ + int (*function_3) (void); /* mouse_button 3 function */ } Button; @@ -41,5 +41,5 @@ int outline; /* draw an outline? */ int cursor; /* location of cursor (if selected) */ - int (*function) (); /* textline function */ + int (*function) (void); /* textline function */ } TextLine; @@ -54,5 +54,5 @@ int cursor_x; /* location of cursor (if selected) */ int cursor_y; /* location of cursor (if selected) */ - int (*function) (); /* textline function */ + int (*function) (void); /* textline function */ } TextBox; Index: trunk/Ohana/src/kapa2/include/prototypes.h =================================================================== --- trunk/Ohana/src/kapa2/include/prototypes.h (revision 21086) +++ trunk/Ohana/src/kapa2/include/prototypes.h (revision 21153) @@ -4,6 +4,6 @@ void SetUpGraphic PROTO((int *argc, char **argv)); void DefineLayout PROTO((int, char **)); -int EventLoop PROTO(()); -void CloseDisplay PROTO(()); +int EventLoop PROTO((void)); +void CloseDisplay PROTO((void)); /* SetUpGraphic */ @@ -43,7 +43,7 @@ /* EventLoop */ int PScommand PROTO((int sock)); -int CheckPipe PROTO(()); +int CheckPipe PROTO((void)); int Reconfig PROTO((XEvent *event)); -void Refresh PROTO(()); +void Refresh PROTO((void)); /* CheckPipe */ @@ -79,18 +79,18 @@ /* Section Utilities */ -Section *InitSection PROTO(()); +Section *InitSection PROTO((void)); void FreeSection PROTO((Section *section)); -void FreeSections PROTO(()); +void FreeSections PROTO((void)); Section *AddSection PROTO((char *name, float x, float y, float dx, float dy)); int DelSection PROTO((char *name)); int GetSectionByName PROTO((char *name)); -int GetNumberOfSections PROTO(()); +int GetNumberOfSections PROTO((void)); Section *GetSectionByNumber PROTO((int N)); -Section *GetActiveSection PROTO(()); +Section *GetActiveSection PROTO((void)); int SetActiveSectionByNumber PROTO((int N)); int ListSection PROTO((int sock)); void SetSectionSizes PROTO((Section *section)); -KapaGraphWidget *InitGraph PROTO(()); +KapaGraphWidget *InitGraph PROTO((void)); void DrawGraph PROTO((KapaGraphWidget *graph)); void SetGraphSize PROTO((Section *section)); @@ -131,5 +131,5 @@ void bDrawTick PROTO((double fx, double fy, double dfx, double dfy, int P, double min, double max, double value, int IsLabel, int IsMajor, int naxis)); void bDrawClipLine PROTO((double x0, double y0, double x1, double y1, double X0, double Y1, double X1, double Y0)); -bDrawBuffer *bDrawIt PROTO(()); +bDrawBuffer *bDrawIt PROTO((void)); void bDrawGraph PROTO((KapaGraphWidget *graph)); @@ -137,12 +137,12 @@ int LastEvent PROTO((Display *display, int type, XEvent *event)); void FreeObjectData PROTO((Gobjects *object)); -void FlushDisplay PROTO(()); +void FlushDisplay PROTO((void)); unsigned long GetColor PROTO((Display *display, char *name, Colormap colormap, unsigned long default_color)); void QuitX PROTO((Display *display, char *message)); -Graphic *GetGraphic PROTO(()); +Graphic *GetGraphic PROTO((void)); int GetPixelCount PROTO((int sock)); -int Center PROTO(()); -int Parity PROTO(()); +int Center PROTO((int sock)); +int Parity PROTO((int sock)); void SetColorScale PROTO((Graphic *graphic, KapaImageWidget *image)); void SetColorScale1D PROTO((Graphic *graphic, KapaImageWidget *image)); @@ -155,5 +155,5 @@ int LoadPicture PROTO((int sock)); -KapaImageWidget *InitImageWidget PROTO(()); +KapaImageWidget *InitImageWidget PROTO((void)); int InitImageChannel PROTO((KapaImageChannel *channel)); void FreeImage PROTO((KapaImageWidget *image)); @@ -161,5 +161,5 @@ void InitButtonSize PROTO((Button *button, int width, int height, char *bitmap)); -void InitButtonFunc PROTO((Button *button, int (*function)())); +void InitButtonFunc PROTO((Button *button, int (*function)(Graphic *graphic, KapaImageWidget *image))); void DrawImage PROTO((KapaImageWidget *image)); void DrawButton PROTO((Graphic *graphic, Button *button)); @@ -232,10 +232,10 @@ // void CreateZoom32 (KapaImageWidget *image, Graphic *graphic, double x, double y); -int GetActiveSocket (); +int GetActiveSocket (void); void InvertButton (Graphic *graphic, Button *button); void bDrawOverlay (KapaImageWidget *image, int N); /* color cube tools */ -CCNode *CCNodeAlloc (); +CCNode *CCNodeAlloc (void); CCNode *CCFindChild (CCNode *node, float x, float y, float z); int CCSplitNode (CCNode *node); @@ -253,3 +253,3 @@ int SetColorScale3D_CC (Graphic *graphic, KapaImageWidget *image); -int SetColorCubeHistogram (); +int SetColorCubeHistogram (void); Index: trunk/Ohana/src/kapa2/include/structures.h =================================================================== --- trunk/Ohana/src/kapa2/include/structures.h (revision 21086) +++ trunk/Ohana/src/kapa2/include/structures.h (revision 21153) @@ -78,5 +78,5 @@ int cursor_x; /* location of cursor (if selected) */ int cursor_y; /* location of cursor (if selected) */ - int (*function) (); /* textline function */ + int (*function) (void); /* textline function */ } TextBox; Index: trunk/Ohana/src/kapa2/src/ButtonFunctions.c =================================================================== --- trunk/Ohana/src/kapa2/src/ButtonFunctions.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/ButtonFunctions.c (revision 21153) @@ -102,5 +102,5 @@ image[0].DecimalDegrees = image[0].DecimalDegrees ^ TRUE; StatusBox (graphic, image); - FlushDisplay (graphic[0].display); + FlushDisplay (); return (TRUE); Index: trunk/Ohana/src/kapa2/src/CheckVisual.c =================================================================== --- trunk/Ohana/src/kapa2/src/CheckVisual.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/CheckVisual.c (revision 21153) @@ -34,4 +34,6 @@ } +// skip the default and the PseudoColor visuals, go for TrueColor first +# if (0) /* check default visual first */ for (i = 0; (i < Nfound) && (graphic[0].visual != visual_list[i].visual); i++); @@ -40,8 +42,10 @@ exit (0); } +# endif // set these based on selected visual isColor = isDefault = isDynamic = FALSE; +# if (0) // attempt to select the most desirable type of visual: Default as PseudoColor (XXX is it still true?) if (DEBUG) fprintf (stderr, "default visual class is %d\n", visual_list[i].class); @@ -52,4 +56,16 @@ goto test_pixels; } +# endif + + // attempt to select the most desirable type of visual: TrueColor (XXX is it still true?) + for (i = 0; (i < Nfound) && (visual_list[i].class != TrueColor); i++); + if (i != Nfound) { + isColor = TRUE; + if (DEBUG) fprintf (stderr, "visual class is %d\n", visual_list[i].class); + isDefault = (graphic[0].visual == visual_list[i].visual); + graphic[0].visual = visual_list[i].visual; + graphic[0].visualclass = FALSE; + goto test_pixels; + } // attempt to select the most desirable type of visual: PseudoColor (XXX is it still true?) @@ -72,15 +88,4 @@ graphic[0].visual = visual_list[i].visual; graphic[0].visualclass = TRUE; - goto test_pixels; - } - - // attempt to select the most desirable type of visual: TrueColor (XXX is it still true?) - for (i = 0; (i < Nfound) && (visual_list[i].class != TrueColor); i++); - if (i != Nfound) { - isColor = TRUE; - if (DEBUG) fprintf (stderr, "visual class is %d\n", visual_list[i].class); - isDefault = (graphic[0].visual == visual_list[i].visual); - graphic[0].visual = visual_list[i].visual; - graphic[0].visualclass = FALSE; goto test_pixels; } Index: trunk/Ohana/src/kapa2/src/DefineSection.c =================================================================== --- trunk/Ohana/src/kapa2/src/DefineSection.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/DefineSection.c (revision 21153) @@ -34,5 +34,5 @@ if (MoveSection) { SetSectionSizes (section); - Refresh (1); + Refresh (); } Index: trunk/Ohana/src/kapa2/src/EraseCurrentPlot.c =================================================================== --- trunk/Ohana/src/kapa2/src/EraseCurrentPlot.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/EraseCurrentPlot.c (revision 21153) @@ -15,5 +15,5 @@ if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window); - Refresh (1); + Refresh (); return (TRUE); Index: trunk/Ohana/src/kapa2/src/ErasePlots.c =================================================================== --- trunk/Ohana/src/kapa2/src/ErasePlots.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/ErasePlots.c (revision 21153) @@ -18,5 +18,5 @@ if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window); - Refresh (1); + Refresh (); return (TRUE); Index: trunk/Ohana/src/kapa2/src/EraseSections.c =================================================================== --- trunk/Ohana/src/kapa2/src/EraseSections.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/EraseSections.c (revision 21153) @@ -11,5 +11,5 @@ if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window); - Refresh (1); + Refresh (); return (TRUE); Index: trunk/Ohana/src/kapa2/src/EventLoop.c =================================================================== --- trunk/Ohana/src/kapa2/src/EventLoop.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/EventLoop.c (revision 21153) @@ -25,5 +25,5 @@ display = graphic->display; - if (USE_XWINDOW) Refresh (1); + if (USE_XWINDOW) Refresh (); status = TRUE; @@ -46,5 +46,5 @@ if (LastEvent (display, ConfigureNotify, &event)) Reconfig (&event); if (LastEvent (display, CirculateNotify, &event)) Reconfig (&event); - if (LastEvent (display, Expose, &event)) Refresh (1); + if (LastEvent (display, Expose, &event)) Refresh (); if (LastEvent (display, MappingNotify, &event)) XRefreshKeyboardMapping ((XMappingEvent *) &event); if (LastEvent (display, MotionNotify, &event)) UpdatePointer (graphic, (XMotionEvent *) &event); Index: trunk/Ohana/src/kapa2/src/FlushDisplay.c =================================================================== --- trunk/Ohana/src/kapa2/src/FlushDisplay.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/FlushDisplay.c (revision 21153) @@ -5,5 +5,5 @@ # define DTIME(A,B) ((A.tv_sec - B.tv_sec) + 1e-6*(A.tv_usec - B.tv_usec)) -void FlushDisplay () { +void FlushDisplay (void) { struct timeval now; Index: trunk/Ohana/src/kapa2/src/Image.c =================================================================== --- trunk/Ohana/src/kapa2/src/Image.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/Image.c (revision 21153) @@ -190,5 +190,5 @@ } - FlushDisplay (graphic[0].display); + FlushDisplay (); } Index: trunk/Ohana/src/kapa2/src/InvertButton.c =================================================================== --- trunk/Ohana/src/kapa2/src/InvertButton.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/InvertButton.c (revision 21153) @@ -12,5 +12,5 @@ DrawButton (graphic, button); - FlushDisplay (graphic[0].display); + FlushDisplay (); graphic[0].fore = fore; Index: trunk/Ohana/src/kapa2/src/LoadFrame.c =================================================================== --- trunk/Ohana/src/kapa2/src/LoadFrame.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/LoadFrame.c (revision 21153) @@ -81,5 +81,5 @@ } if (USE_XWINDOW) XClearWindow (graphic.display, graphic.window); - Refresh (1); + Refresh (); } else { FlushDisplay (); Index: trunk/Ohana/src/kapa2/src/MapWindow.c =================================================================== --- trunk/Ohana/src/kapa2/src/MapWindow.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/MapWindow.c (revision 21153) @@ -6,4 +6,4 @@ XMapRaised (graphic->display, graphic->window); XMapSubwindows (graphic->display, graphic->window); - FlushDisplay (graphic); + FlushDisplay (); } Index: trunk/Ohana/src/kapa2/src/Reconfig.c =================================================================== --- trunk/Ohana/src/kapa2/src/Reconfig.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/Reconfig.c (revision 21153) @@ -29,5 +29,5 @@ if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window); - Refresh (1); + Refresh (); return (TRUE); Index: trunk/Ohana/src/kapa2/src/Refresh.c =================================================================== --- trunk/Ohana/src/kapa2/src/Refresh.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/Refresh.c (revision 21153) @@ -1,5 +1,5 @@ # include "Ximage.h" -void Refresh () { +void Refresh (void) { int i, Nsection; Index: trunk/Ohana/src/kapa2/src/Resize.c =================================================================== --- trunk/Ohana/src/kapa2/src/Resize.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/Resize.c (revision 21153) @@ -34,5 +34,5 @@ if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window); - Refresh (1); + Refresh (); return (TRUE); Index: trunk/Ohana/src/kapa2/src/Sections.c =================================================================== --- trunk/Ohana/src/kapa2/src/Sections.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/Sections.c (revision 21153) @@ -177,5 +177,5 @@ sections[N] = sections[N+1]; sections[N+1] = tmpSection; - Refresh (1); + Refresh (); return (TRUE); } @@ -187,5 +187,5 @@ sections[N] = sections[N-1]; sections[N-1] = tmpSection; - Refresh (1); + Refresh (); return (TRUE); } @@ -199,5 +199,5 @@ } sections[i] = tmpSection; - Refresh (1); + Refresh (); return (TRUE); } @@ -211,5 +211,5 @@ } sections[i] = tmpSection; - Refresh (1); + Refresh (); return (TRUE); } Index: trunk/Ohana/src/kapa2/src/SetGraphData.c =================================================================== --- trunk/Ohana/src/kapa2/src/SetGraphData.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/SetGraphData.c (revision 21153) @@ -73,5 +73,5 @@ if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window); - Refresh (1); + Refresh (); return (TRUE); Index: trunk/Ohana/src/kapa2/src/SetGraphStyle.c =================================================================== --- trunk/Ohana/src/kapa2/src/SetGraphStyle.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/SetGraphStyle.c (revision 21153) @@ -55,5 +55,5 @@ if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window); - Refresh (1); + Refresh (); return (TRUE); Index: trunk/Ohana/src/kapa2/src/SetLimits.c =================================================================== --- trunk/Ohana/src/kapa2/src/SetLimits.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/SetLimits.c (revision 21153) @@ -33,5 +33,5 @@ if (USE_XWINDOW) XClearWindow (graphic->display, graphic->window); - Refresh (1); + Refresh (); return (TRUE); Index: trunk/Ohana/src/kapa2/src/SetUpGraphic.c =================================================================== --- trunk/Ohana/src/kapa2/src/SetUpGraphic.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/SetUpGraphic.c (revision 21153) @@ -44,5 +44,4 @@ LoadFont (graphic, argc, argv, "fixed"); - // FlushDisplay (graphic); XSetWindowBackground (graphic->display, graphic->window, graphic->back); Index: trunk/Ohana/src/kapa2/src/TopWindow.c =================================================================== --- trunk/Ohana/src/kapa2/src/TopWindow.c (revision 21086) +++ trunk/Ohana/src/kapa2/src/TopWindow.c (revision 21153) @@ -15,4 +15,3 @@ MakeCursor (graphic, DEFAULT_CURSOR); XFreeCursor (graphic->display, graphic->cursor); - // FlushDisplay (graphic); } Index: trunk/Ohana/src/kii/include/structures.h =================================================================== --- trunk/Ohana/src/kii/include/structures.h (revision 21086) +++ trunk/Ohana/src/kii/include/structures.h (revision 21153) @@ -28,7 +28,7 @@ int width, height; char *bitmap; /* picture on button */ - int (*function_1) (); /* mouse_button 1 function */ - int (*function_2) (); /* mouse_button 2 function */ - int (*function_3) (); /* mouse_button 3 function */ + int (*function_1) (void); /* mouse_button 1 function */ + int (*function_2) (void); /* mouse_button 2 function */ + int (*function_3) (void); /* mouse_button 3 function */ } Button; @@ -40,5 +40,5 @@ int outline; /* draw an outline? */ int cursor; /* location of cursor (if selected) */ - int (*function) (); /* textline function */ + int (*function) (void); /* textline function */ } TextLine; @@ -53,5 +53,5 @@ int cursor_x; /* location of cursor (if selected) */ int cursor_y; /* location of cursor (if selected) */ - int (*function) (); /* textline function */ + int (*function) (void); /* textline function */ } TextBox; Index: trunk/Ohana/src/libdvo/include/dvo.h =================================================================== --- trunk/Ohana/src/libdvo/include/dvo.h (revision 21086) +++ trunk/Ohana/src/libdvo/include/dvo.h (revision 21153) @@ -279,8 +279,8 @@ OhanaProjectionMode GetProjectionMode (OhanaProjection proj); -char *libdvo_version (); - -int isRegisteredMosaic (); -int GetRegisteredMosaic (); +char *libdvo_version (void); + +int isRegisteredMosaic (void); +int GetRegisteredMosaic (void); int GetMosaicCoords (Coords *coords); int FindMosaicForImage (Image *images, int Nimages, int entry); @@ -317,5 +317,5 @@ int PhotColor (Average *average, SecFilt *secfilt, Measure *measure, int c1, int c2, double *color); -PhotCodeData *GetPhotcodeTable (); +PhotCodeData *GetPhotcodeTable (void); int LoadPhotcodes (char *catdir_file, char *master_file); @@ -331,7 +331,7 @@ int GetPhotcodeEquivCodebyCode (int code); int GetPhotcodeNsec (int code); -int GetPhotcodeNsecfilt (); +int GetPhotcodeNsecfilt (void); void SetZeroPoint (double ZP); -double GetZeroPoint (); +double GetZeroPoint (void); int *GetPhotcodeEquivList (int code, int *nlist); void ParseColorTerms (char *terms, float *X, int *N); Index: trunk/Ohana/src/libdvo/include/dvo.update.h =================================================================== --- trunk/Ohana/src/libdvo/include/dvo.update.h (revision 21086) +++ trunk/Ohana/src/libdvo/include/dvo.update.h (revision 21153) @@ -275,5 +275,5 @@ int GetPhotcodeEquivCodebyCode (int code); int GetPhotcodeNsec (int code); -int GetPhotcodeNsecfilt (); +int GetPhotcodeNsecfilt (void); void SetZeroPoint (double ZP); int *GetPhotcodeEquivList (int code, int *nlist); Index: trunk/Ohana/src/libkapa/include/kapa.h =================================================================== --- trunk/Ohana/src/libkapa/include/kapa.h (revision 21086) +++ trunk/Ohana/src/libkapa/include/kapa.h (revision 21153) @@ -181,5 +181,5 @@ /* KapaColors */ int KapaColorByName (char *name); -int KapaColormapSize (); +int KapaColormapSize (void); char *KapaColorRGBString (int N); char *KapaColorName (int N); @@ -188,5 +188,5 @@ /* RotFont.c */ -void InitRotFonts PROTO(()); +void InitRotFonts PROTO((void)); int SetRotFont PROTO((char *name, int size)); char *GetRotFont PROTO((int *size)); Index: trunk/Ohana/src/libohana/include/ohana.h =================================================================== --- trunk/Ohana/src/libohana/include/ohana.h (revision 21086) +++ trunk/Ohana/src/libohana/include/ohana.h (revision 21153) @@ -141,5 +141,5 @@ } IOBuffer; -extern double hypot(); +extern double hypot(double,double); /* in string.c */ @@ -183,5 +183,5 @@ /* others */ int Fseek PROTO((FILE *f, long offset, int whence)); -char *ohana_version PROTO(()); +char *ohana_version PROTO((void)); int dgaussjordan PROTO((double **A, double **B, int N, int M)); Index: trunk/Ohana/src/misc/include/missing_protos.h =================================================================== --- trunk/Ohana/src/misc/include/missing_protos.h (revision 21086) +++ trunk/Ohana/src/misc/include/missing_protos.h (revision 21153) @@ -13,8 +13,11 @@ * which depends on this file every time we need to add * a new prototype for the SunOS machines. - * $Id: missing_protos.h,v 1.2 2007-04-18 19:21:46 eugene Exp $ + * $Id: missing_protos.h,v 1.3 2009-01-22 20:43:24 eugene Exp $ * $Locker: $ * * $Log: not supported by cvs2svn $ + * Revision 1.2 2007/04/18 19:21:46 eugene + * dropping non-standard includes + * * Revision 1.1.1.1 2004/11/24 04:39:33 eugene * importing elixir components @@ -205,9 +208,9 @@ #else /* not __GNUC__ */ #include -void perror(); -char *strerror(); -void *memset(); -double drand48(); -long strtol(); +void perror(void); +char *strerror(void); +void *memset(void); +double drand48(void); +long strtol(void); #endif /* __GNUC__ */ #endif /* SUNOS */ Index: trunk/Ohana/src/mosastro/include/mosastro.h =================================================================== --- trunk/Ohana/src/mosastro/include/mosastro.h (revision 21086) +++ trunk/Ohana/src/mosastro/include/mosastro.h (revision 21153) @@ -131,5 +131,5 @@ void FitGradients PROTO((Gradients *grad)); void GetConfig PROTO((char *config, char *field, char *format, int N, void *ptr)); -Gradients *GetGradients PROTO(()); +Gradients *GetGradients PROTO((void)); double GetScatter PROTO((int *Nscatter, double *DL, double *DM, int bright)); int LoadStars PROTO((int Nfile, char **file)); @@ -141,14 +141,14 @@ void area_of_region PROTO((CatStats *region)); void args PROTO((int *argc, char **argv)); -int deproject_raw PROTO(()); -int deproject_stars PROTO(()); +int deproject_raw PROTO((void)); +int deproject_stars PROTO((void)); int dump_grads PROTO((Gradients *grad, char *filename)); -int dump_match PROTO(()); -int dump_rawstars PROTO(()); +int dump_match PROTO((void)); +int dump_rawstars PROTO((void)); int dump_refcat PROTO((StarData *refcat, int Nrefcat)); int dump_stars PROTO((FILE *f, StarData *stars, int Nstars)); int fake_field PROTO((double RA, double DEC)); -void field_combine PROTO(()); -void field_stats PROTO(()); +void field_combine PROTO((void)); +void field_stats PROTO((void)); int find_dec_bands PROTO((CatStats *area)); void fit_add PROTO((double x1, double y1, double x2, double y2)); @@ -156,6 +156,6 @@ void fit_apply_grads PROTO((Coords *distort, Coords *project, int term)); void fit_correct_grads PROTO((Gradients *in, Gradients *out, int term)); -void fit_eval PROTO(()); -void fit_free PROTO(()); +void fit_eval PROTO((void)); +void fit_free PROTO((void)); void fit_init PROTO((int order)); int gaussj PROTO((double **a, int n, double **b, int m)); @@ -170,7 +170,7 @@ StarData *greference PROTO((int *Nrefcat)); CatStats *gregions PROTO((CatStats *patch, int *nregion)); -int init_chips PROTO(()); -int init_field PROTO(()); -void init_regions PROTO(()); +int init_chips PROTO((void)); +int init_field PROTO((void)); +void init_regions PROTO((void)); int load_chips PROTO((char *filename)); int load_field PROTO((char *filename)); @@ -184,8 +184,8 @@ int parse_GSC_line PROTO((CatStats *tregion, char *line)); e_time parse_time PROTO((Header *header)); -void print_help PROTO(()); -int project_ref PROTO(()); +void print_help PROTO((void)); +int project_ref PROTO((void)); int project_refcat PROTO((StarData *refcat, int Nrefcat)); -int project_stars PROTO(()); +int project_stars PROTO((void)); int rfits PROTO((Chip *mychip)); int rtext PROTO((Chip *mychip)); Index: trunk/Ohana/src/nightd/include/nightd.h =================================================================== --- trunk/Ohana/src/nightd/include/nightd.h (revision 21086) +++ trunk/Ohana/src/nightd/include/nightd.h (revision 21153) @@ -28,10 +28,10 @@ int SetPID (pid_t *Xpid, char *Xuser, char *Xmachine); int GetDateTime (char *datestr, char *timestr, float *time); -int WaitForMinute (); -int GetStatus (); -int ResetConfig (); -int SendShutdown (); -int StartUp (); -int SetSignals (); +int WaitForMinute (void); +int GetStatus (void); +int ResetConfig (void); +int SendShutdown (void); +int StartUp (void); +int SetSignals (void); void ToggleSuspend (int sig); void Shutdown (int sig); @@ -40,5 +40,5 @@ char *ExpandWords (char *line); int pcommand (char *line, int timeout); -int WaitForPeriod (); +int WaitForPeriod (void); int DoCommand (char *command, char *name); int freeargs (char **arglist); Index: trunk/Ohana/src/opihi/cmd.astro/cplot.c =================================================================== --- trunk/Ohana/src/opihi/cmd.astro/cplot.c (revision 21086) +++ trunk/Ohana/src/opihi/cmd.astro/cplot.c (revision 21153) @@ -75,4 +75,5 @@ } Xvec.Nelements = Npts; + Yvec.Nelements = Npts; graphmode.etype = 0; Index: trunk/Ohana/src/opihi/dvo/dbExtractAverages.c =================================================================== --- trunk/Ohana/src/opihi/dvo/dbExtractAverages.c (revision 21086) +++ trunk/Ohana/src/opihi/dvo/dbExtractAverages.c (revision 21153) @@ -152,9 +152,7 @@ break; case MAG_CHISQ: - // GetPhotcodeEquivCodebyCode (field->photcode) value.Flt = PhotXm (field->photcode, average, secfilt); break; case MAG_ERR: - // GetPhotcodeEquivCodebyCode (field->photcode) if ((field->photcode->type == PHOT_REF) || (field->photcode->type == PHOT_DEP)) { for (i = 0; i < average[0].Nmeasure; i++) { @@ -167,4 +165,15 @@ } break; + case MAG_PHOT_FLAGS: + if ((field->photcode->type == PHOT_REF) || (field->photcode->type == PHOT_DEP)) { + for (i = 0; i < average[0].Nmeasure; i++) { + if (field->photcode->code != measure[i].photcode) continue; + value.Int = measure[i].photFlags; + break; + } + } else { + value.Int = 0; + } + break; case MAG_NCODE: // XXX push these into dvo_photcode_ops APIs Index: trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c =================================================================== --- trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c (revision 21086) +++ trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c (revision 21153) @@ -123,4 +123,11 @@ } else { value.Flt = measure[0].dM; + } + break; + case MAG_PHOT_FLAGS: + if ((field->photcode->type == PHOT_REF) || (field->photcode->type == PHOT_DEP)) { + value.Int = measure[0].photFlags; + } else { + value.Int = 0; } break; @@ -378,6 +385,8 @@ break; case MEAS_OBJ_ID: /* OK */ - // XXX this should probably return average[0].objID value.Int = average[0].objID; + break; + case MEAS_CAT_ID: /* OK */ + value.Int = average[0].catID; break; case MEAS_IMAGE_ID: /* OK */ Index: trunk/Ohana/src/opihi/dvo/dbFields.c =================================================================== --- trunk/Ohana/src/opihi/dvo/dbFields.c (revision 21086) +++ trunk/Ohana/src/opihi/dvo/dbFields.c (revision 21153) @@ -30,15 +30,16 @@ int GetMagMode (char *string) { - if (!strcasecmp (string, "inst")) return (MAG_INST); - if (!strcasecmp (string, "cat")) return (MAG_CAT); - if (!strcasecmp (string, "sys")) return (MAG_SYS); - if (!strcasecmp (string, "rel")) return (MAG_REL); - if (!strcasecmp (string, "cal")) return (MAG_CAL); - if (!strcasecmp (string, "ave")) return (MAG_AVE); - if (!strcasecmp (string, "ref")) return (MAG_REF); - if (!strcasecmp (string, "err")) return (MAG_ERR); - if (!strcasecmp (string, "chisq")) return (MAG_CHISQ); - if (!strcasecmp (string, "ncode")) return (MAG_NCODE); - if (!strcasecmp (string, "nphot")) return (MAG_NPHOT); + if (!strcasecmp (string, "inst")) return (MAG_INST); + if (!strcasecmp (string, "cat")) return (MAG_CAT); + if (!strcasecmp (string, "sys")) return (MAG_SYS); + if (!strcasecmp (string, "rel")) return (MAG_REL); + if (!strcasecmp (string, "cal")) return (MAG_CAL); + if (!strcasecmp (string, "ave")) return (MAG_AVE); + if (!strcasecmp (string, "ref")) return (MAG_REF); + if (!strcasecmp (string, "err")) return (MAG_ERR); + if (!strcasecmp (string, "photflags")) return (MAG_PHOT_FLAGS); + if (!strcasecmp (string, "chisq")) return (MAG_CHISQ); + if (!strcasecmp (string, "ncode")) return (MAG_NCODE); + if (!strcasecmp (string, "nphot")) return (MAG_NPHOT); return (MAG_NONE); } @@ -75,12 +76,10 @@ } - // enforce compatibility - // XXX this is kind of poorly done - if ((code[0].type == PHOT_REF) && (*mode != MAG_ERR)) { - *mode = MAG_CAT; - } - if (code[0].type == PHOT_DEP) { - if (useDefault) { + if (useDefault) { + if (code[0].type == PHOT_REF) { + *mode = MAG_CAT; + } + if (code[0].type == PHOT_DEP) { *mode = MAG_REL; } @@ -186,4 +185,5 @@ if (!strcasecmp (fieldName, "DETID")) ESCAPE (MEAS_DET_ID, MAG_NONE, OPIHI_INT); if (!strcasecmp (fieldName, "OBJID")) ESCAPE (MEAS_OBJ_ID, MAG_NONE, OPIHI_INT); + if (!strcasecmp (fieldName, "CATID")) ESCAPE (MEAS_CAT_ID, MAG_NONE, OPIHI_INT); if (!strcasecmp (fieldName, "IMAGEID")) ESCAPE (MEAS_IMAGE_ID, MAG_NONE, OPIHI_INT); if (!strcasecmp (fieldName, "PSF_QF")) ESCAPE (MEAS_PSF_QF, MAG_NONE, OPIHI_FLT); @@ -206,5 +206,14 @@ field->ID = MEAS_MAG; field->magMode = mode; - field->type = OPIHI_FLT; + switch (mode) { + case MAG_NCODE: + case MAG_NPHOT: + case MAG_PHOT_FLAGS: + field->type = OPIHI_INT; + break; + default: + field->type = OPIHI_FLT; + break; + } field->photcode = code; return (TRUE); @@ -280,5 +289,14 @@ field->ID = AVE_MAG; field->magMode = mode; - field->type = OPIHI_FLT; + switch (mode) { + case MAG_NCODE: + case MAG_NPHOT: + case MAG_PHOT_FLAGS: + field->type = OPIHI_INT; + break; + default: + field->type = OPIHI_FLT; + break; + } field->photcode = code; return (TRUE); Index: trunk/Ohana/src/opihi/dvo/gimages.c =================================================================== --- trunk/Ohana/src/opihi/dvo/gimages.c (revision 21086) +++ trunk/Ohana/src/opihi/dvo/gimages.c (revision 21153) @@ -103,10 +103,78 @@ if (!FindMosaicForImage (image, Nimage, i)) continue; + typehash = wordhash (&image[i].coords.ctype[4]); + + // for non-linear astrometry solutions, a point which is far from the image may + // potentially appear to land in the image: at large field-position, the high order + // terms which are supposed to be perturbations may dominate the solution + + // XXX this code checks if the image is even in the ballpark. this is not a great + // solution. the better way to do this would be to use the linear portions of the fit + // only for RD_to_XY, then see if the result is close. + { + Coords local; + double Ro, Do, Xo, Yo, Xs, Ys, Xe, Ye, Radius; + + if (typehash == DistortImage) { + Xo = 0.0; + Yo = 0.0; + } else { + Xo = 0.5*image[i].NX; + Yo = 0.5*image[i].NY; + } + + XY_to_RD (&Ro, &Do, Xo, Yo, &image[i].coords); + + local.crval1 = Ro; + local.crval2 = Do; + local.crpix1 = local.crpix2 = 0.0; + local.cdelt1 = local.cdelt2 = 1.0/3600.0; + local.pc1_1 = local.pc2_2 = 1.0; + local.pc2_1 = local.pc1_2 = 0.0; + local.Npolyterms = 1; + strcpy (local.ctype, "RA---TAN"); + + if (typehash == DistortImage) { + Xs = -0.5*image[i].NX; + Ys = -0.5*image[i].NY; + Xe = +0.5*image[i].NX; + Ye = +0.5*image[i].NY; + } else { + Xs = 0.0; + Ys = 0.0; + Xe = image[i].NX; + Ye = image[i].NY; + } + + XY_to_RD (&Ro, &Do, Xs, Ys, &image[i].coords); + RD_to_XY (&Xo, &Xo, Ro, Do, &local); + Radius = hypot (Xo, Yo); + // fprintf (stderr, "%s: %f %f %f ", image[i].name, local.crval1, local.crval2, Radius); + + XY_to_RD (&Ro, &Do, Xs, Ye, &image[i].coords); + RD_to_XY (&Xo, &Xo, Ro, Do, &local); + Radius = MAX (Radius, hypot (Xo, Yo)); + // fprintf (stderr, "%f ", Radius); + + XY_to_RD (&Ro, &Do, Xe, Ys, &image[i].coords); + RD_to_XY (&Xo, &Xo, Ro, Do, &local); + Radius = MAX (Radius, hypot (Xo, Yo)); + // fprintf (stderr, "%f ", Radius); + + XY_to_RD (&Ro, &Do, Xe, Ye, &image[i].coords); + RD_to_XY (&Xo, &Xo, Ro, Do, &local); + Radius = MAX (Radius, hypot (Xo, Yo)); + // fprintf (stderr, "%f ", Radius); + + RD_to_XY (&Xo, &Yo, Ra, Dec, &local); + // fprintf (stderr, " : %f\n", hypot(Xo,Yo)); + if (hypot(Xo,Yo) > 1.5*Radius) continue; + // fprintf (stderr, " ** try me **\n"); + } + status = RD_to_XY (&X, &Y, Ra, Dec, &image[i].coords); if (!finite(X)) continue; if (!finite(Y)) continue; if (!status) continue; - - typehash = wordhash (&image[i].coords.ctype[4]); if (typehash == DistortImage) { Index: trunk/Ohana/src/opihi/dvo/skycoverage.c =================================================================== --- trunk/Ohana/src/opihi/dvo/skycoverage.c (revision 21086) +++ trunk/Ohana/src/opihi/dvo/skycoverage.c (revision 21153) @@ -1,9 +1,12 @@ # include "dvoshell.h" + +int wordhash (char *word); int skycoverage (int argc, char **argv) { + int WITH_MOSAIC, SOLO_MOSAIC; int i, N, Nimage, status, TimeSelect, ByName, xs, ys; time_t tzero, tend; - double pixscale, dPix, r, d, Xi, Yi, Xs, Ys, x[2], y[2], trange; + double pixscale, dX, dY, Npts, r, d, Xi, Yi, Xs, Ys, x[2], y[2], trange, RaCenter; Image *image; char name[256]; @@ -12,4 +15,25 @@ Buffer *buf; Coords coords; + int typehash; + + WITH_MOSAIC = FALSE; + if ((N = get_argument (argc, argv, "+mosaic"))) { + remove_argument (N, &argc, argv); + WITH_MOSAIC = TRUE; + } + + SOLO_MOSAIC = FALSE; + if ((N = get_argument (argc, argv, "-mosaic"))) { + remove_argument (N, &argc, argv); + SOLO_MOSAIC = TRUE; + WITH_MOSAIC = TRUE; + } + + RaCenter = 0.0; + if ((N = get_argument (argc, argv, "-ra-center"))) { + remove_argument (N, &argc, argv); + RaCenter = atof (argv[N]); + remove_argument (N, &argc, argv); + } ByName = FALSE; @@ -61,7 +85,8 @@ if (argc != 4) { - gprint (GP_ERR, "USAGE: skycoverage (buffer) (pixscale) (dPix) [-time start range] [-name name]\n"); + gprint (GP_ERR, "USAGE: skycoverage (buffer) (pixscale) (Npts) [-time start range] [-name name]\n"); gprint (GP_ERR, " (buffer) saves bitmapped AIT plot\n"); gprint (GP_ERR, " (pixscale) specifies the pixel size in degrees\n"); + gprint (GP_ERR, " (Npts) gives the number of test points per image in each dimension\n"); gprint (GP_ERR, " note: we need 64800 / (pixscale)^2 pixels to represent the sky\n"); return (FALSE); @@ -70,5 +95,5 @@ if ((buf = SelectBuffer (argv[1], ANYBUFFER, TRUE)) == NULL) return (FALSE); pixscale = atof(argv[2]); - dPix = atof(argv[3]); + Npts = atof(argv[3]); Nx = 360/pixscale; @@ -80,11 +105,13 @@ strcpy (buf[0].file, "(empty)"); - coords.crval1 = 180; + coords.crval1 = RaCenter; coords.crval2 = 0; coords.crpix1 = 0.5*Nx; coords.crpix2 = 0.5*Ny; strcpy (coords.ctype, "DEC--AIT"); - coords.pc1_1 = coords.pc2_2 = 1; - coords.pc1_2 = coords.pc2_1 = 0; + coords.pc1_1 = -1.0; + coords.pc2_2 = +1.0; + coords.pc1_2 = 0.0; + coords.pc2_1 = 0.0; coords.cdelt1 = coords.cdelt2 = pixscale; coords.Npolyterms = 0; @@ -109,8 +136,16 @@ } + int DistortImage = wordhash ("-DIS"); + for (i = 0; i < Nimage; i++) { if (ByName && strcmp (name, image[i].name)) continue; if (TimeSelect && ((image[i].tzero < tzero) || (image[i].tzero+image[i].trate*image[i].NY > tzero + trange))) continue; if (!FindMosaicForImage (image, Nimage, i)) continue; + + typehash = wordhash (&image[i].coords.ctype[4]); + + /* DIS images represent a field, not a chip */ + if ((typehash == DistortImage) && !WITH_MOSAIC) continue; + if ((typehash != DistortImage) && SOLO_MOSAIC) continue; /* project this image to screen display coords */ @@ -125,9 +160,16 @@ status = FALSE; - for (Yi = y[0] + 0.5*dPix; Yi < y[1]; Yi += dPix) { - for (Xi = x[0] + 0.5*dPix; Xi < x[1]; Xi += dPix) { + dX = (x[1] - x[0]) / Npts; + dY = (y[1] - y[0]) / Npts; + + for (Yi = y[0] + 0.5*dY; Yi < y[1]; Yi += dY) { + for (Xi = x[0] + 0.5*dX; Xi < x[1]; Xi += dX) { XY_to_RD (&r, &d, Xi, Yi, &image[i].coords); r = ohana_normalize_angle (r); status = RD_to_XY (&Xs, &Ys, r, d, &coords); + if (Xs < 0) continue; + if (Ys < 0) continue; + if (Xs >= Nx) continue; + if (Ys >= Ny) continue; if (status) { xs = (int)Xs; Index: trunk/Ohana/src/opihi/include/astro.h =================================================================== --- trunk/Ohana/src/opihi/include/astro.h (revision 21086) +++ trunk/Ohana/src/opihi/include/astro.h (revision 21153) @@ -9,6 +9,6 @@ # define ASTRO_H -void InitAstro (); -void FreeAstro (); +void InitAstro (void); +void FreeAstro (void); typedef struct { Index: trunk/Ohana/src/opihi/include/basic.h =================================================================== --- trunk/Ohana/src/opihi/include/basic.h (revision 21086) +++ trunk/Ohana/src/opihi/include/basic.h (revision 21153) @@ -3,6 +3,6 @@ # include "dvomath.h" -void cleanup (); -void InitBasic (); -void FreeBasic (); -void InitBasic_PantasksClient (); +void cleanup (void); +void InitBasic (void); +void FreeBasic (void); +void InitBasic_PantasksClient (void); Index: trunk/Ohana/src/opihi/include/data.h =================================================================== --- trunk/Ohana/src/opihi/include/data.h (revision 21086) +++ trunk/Ohana/src/opihi/include/data.h (revision 21153) @@ -33,9 +33,9 @@ } Book; -void InitData (); -void FreeData (); +void InitData (void); +void FreeData (void); /* in book.c */ -void InitBooks (); +void InitBooks (void); void InitBook (Book *book, char *name); void FreeBook (Book *book); @@ -44,5 +44,5 @@ Book *CreateBook (char *name); int DeleteBook (Book *book); -void ListBooks (); +void ListBooks (void); /* in page.c */ @@ -61,6 +61,6 @@ /* in queues.c */ -void InitQueues (); -void ListQueues (); +void InitQueues (void); +void ListQueues (void); Queue *FindQueue (char *name); Queue *CreateQueue (char *name); @@ -151,12 +151,12 @@ int read_table_vectors (int argc, char **argv, char *extname); -void *db_getConnection (); +void *db_getConnection (void); int bracket (double *list, int Nlist, int mode, double value); int ibracket (int *list, int Nlist, int mode, double value); -void FreeKapa (); -void FreeQueues (); -void FreeBooks (); +void FreeKapa (void); +void FreeQueues (void); +void FreeBooks (void); # endif Index: trunk/Ohana/src/opihi/include/dimm.h =================================================================== --- trunk/Ohana/src/opihi/include/dimm.h (revision 21086) +++ trunk/Ohana/src/opihi/include/dimm.h (revision 21153) @@ -6,5 +6,5 @@ # include "sbig.h" -void InitDIMM (); +void InitDIMM (void); /* telescope.c */ @@ -19,7 +19,7 @@ int setTime (char *lst); int getSite (double *lon, double *lat, double *lst); -int ParkScope(); -int SleepScope(); -int WakeScope(); +int ParkScope(void); +int SleepScope(void); +int WakeScope(void); /* Serial.c */ @@ -36,14 +36,14 @@ /* camera.c */ int InitCamera (int port); -void DumpCameraInfo (); +void DumpCameraInfo (void); void CameraFullSize (int *x, int *y); int SetTemperature (double temp); -double GetTemperature (); -int DumpCameraStatus (); +double GetTemperature (void); +int DumpCameraStatus (void); int Exposure (double exptime); static int readout_callback (float percent); int ReadOut (int x, int y, int dx, int dy, int binning, unsigned short *buffer); -int OpenShutter (); -int CloseShutter (); +int OpenShutter (void); +int CloseShutter (void); /* this image structure stuff is considered for further development */ Index: trunk/Ohana/src/opihi/include/display.h =================================================================== --- trunk/Ohana/src/opihi/include/display.h (revision 21086) +++ trunk/Ohana/src/opihi/include/display.h (revision 21153) @@ -20,6 +20,6 @@ int SetImage PROTO((KapaImageData *data)); -void QuitKapa PROTO(()); -void InitKapa PROTO(()); +void QuitKapa PROTO((void)); +void InitKapa PROTO((void)); int open_kapa PROTO((int entry)); int close_kapa PROTO((char *name)); @@ -27,5 +27,5 @@ int DelKapaDevice PROTO((char *name)); int FindKapaDevice PROTO((char *name)); -char *GetKapaName PROTO(()); +char *GetKapaName PROTO((void)); /* calling program need to define a function 'get_variable' which Index: trunk/Ohana/src/opihi/include/dvoshell.h =================================================================== --- trunk/Ohana/src/opihi/include/dvoshell.h (revision 21086) +++ trunk/Ohana/src/opihi/include/dvoshell.h (revision 21153) @@ -33,4 +33,5 @@ MAG_REF, MAG_ERR, + MAG_PHOT_FLAGS, MAG_CHISQ, MAG_NCODE, @@ -99,4 +100,5 @@ MEAS_DET_ID, MEAS_OBJ_ID, + MEAS_CAT_ID, MEAS_IMAGE_ID, MEAS_PSF_QF, @@ -262,8 +264,8 @@ double *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param)); double *ExtractMeasuresDMag PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist)); -void FreeImageSelection PROTO(()); -void FreeImageSelection PROTO(()); +void FreeImageSelection PROTO((void)); +void FreeImageSelection PROTO((void)); int GetAverageParam PROTO((char *parname)); -void GetAverageParamHelp PROTO(()); +void GetAverageParamHelp PROTO((void)); int GetMagMode PROTO((char *string)); double GetMeasure PROTO((int param, Average *average, Measure *measure, double mag)); @@ -271,9 +273,9 @@ int GetMeasureTypeCode PROTO((Measure *measure)); int GetPhotcodeInfo PROTO((char *string, PhotCode **Code, int *Mode)); -int GetSelectionParam PROTO(()); +int GetSelectionParam PROTO((void)); int GetTimeSelection PROTO((time_t *tz, time_t *te)); -void InitDVO PROTO(()); -void FreeDVO PROTO(()); -int InitPhotcodes PROTO(()); +void InitDVO PROTO((void)); +void FreeDVO PROTO((void)); +int InitPhotcodes PROTO((void)); Image *LoadImages PROTO((int *Nimage)); Image *MatchImage PROTO((unsigned int time, short int source)); @@ -285,6 +287,6 @@ SkyList *SkyListLoadFile PROTO((char *filename)); int SetCATDIR PROTO((char *path, int verbose)); -char * GetCATDIR PROTO(()); -SkyTable *GetSkyTable PROTO(()); +char * GetCATDIR PROTO((void)); +SkyTable *GetSkyTable PROTO((void)); SkyList *SkyListFromFile PROTO((char *filename)); SkyRegionSelection *SetRegionSelection PROTO((int *argc, char **argv)); @@ -339,5 +341,5 @@ int get_skyregion (double *Rs, double *Re, double *Ds, double *De); int set_skyregion (double Rs, double Re, double Ds, double De); -void FreeImageSelection (); +void FreeImageSelection (void); void FreeSkyRegionSelection (SkyRegionSelection *selection); @@ -345,14 +347,14 @@ int dbExtractMeasuresInitTransform (CoordTransformSystem target); -int dbExtractMeasuresInitAve (); -int dbExtractMeasuresInitMeas (); -int dbExtractMeasuresInit (); +int dbExtractMeasuresInitAve (void); +int dbExtractMeasuresInitMeas (void); +int dbExtractMeasuresInit (void); int dbExtractAveragesInitTransform (CoordTransformSystem target); -int dbExtractAveragesInit (); +int dbExtractAveragesInit (void); int dbExtractImagesInitTransform (CoordTransformSystem target); -int dbExtractImagesInit (); -int dbExtractImagesReset (); +int dbExtractImagesInit (void); +int dbExtractImagesReset (void); # endif Index: trunk/Ohana/src/opihi/include/imfit.h =================================================================== --- trunk/Ohana/src/opihi/include/imfit.h (revision 21086) +++ trunk/Ohana/src/opihi/include/imfit.h (revision 21153) @@ -8,5 +8,5 @@ opihi_flt (*fitfunc)(opihi_flt, opihi_flt, opihi_flt *, int, opihi_flt *); -void (*imfit_cleanup)(); +void (*imfit_cleanup)(void); void fgauss_setup (char *name); Index: trunk/Ohana/src/opihi/include/mana.h =================================================================== --- trunk/Ohana/src/opihi/include/mana.h (revision 21086) +++ trunk/Ohana/src/opihi/include/mana.h (revision 21153) @@ -5,6 +5,6 @@ # ifndef MANA_H -void InitMana (); -void FreeMana (); +void InitMana (void); +void FreeMana (void); int *findrowpeaks (float *row, int Nrow, float threshold, int *npeaks); Index: trunk/Ohana/src/opihi/include/pantasks.h =================================================================== --- trunk/Ohana/src/opihi/include/pantasks.h (revision 21086) +++ trunk/Ohana/src/opihi/include/pantasks.h (revision 21153) @@ -167,17 +167,17 @@ /* scheduler prototypes */ -void InitPantasks (); -void FreePantasks (); - -void InitPantasksServer (); -void FreePantasksServer (); - -void InitPantasksClient (); -void FreePantasksClient (); - -void InitTasks (); -void FreeTasks (); - -Task *NextTask (); +void InitPantasks (void); +void FreePantasks (void); + +void InitPantasksServer (void); +void FreePantasksServer (void); + +void InitPantasksClient (void); +void FreePantasksClient (void); + +void InitTasks (void); +void FreeTasks (void); + +Task *NextTask (void); Task *FindTask (char *name); void ListTasks (int verbose); @@ -186,11 +186,11 @@ Task *CreateTask (char *name); int ValidateTask (Task *task, int RequireStatic); -int RegisterNewTask (); -int DeleteNewTask (); -Task *GetNewTask (); -Task *GetActiveTask (); +int RegisterNewTask (void); +int DeleteNewTask (void); +Task *GetNewTask (void); +Task *GetActiveTask (void); void SetTaskTimer (struct timeval *timer); double GetTaskTimer (struct timeval start, int verbose); -void InitTaskTimers (); +void InitTaskTimers (void); int TaskHash (char *input); int RemoveTask (Task *task); @@ -200,15 +200,15 @@ void UpdateTaskTimerStats (Task *task, int mode, double dtime); -int NextJobID (); -void InitJobIDs (); -void FreeJobIDs (); +int NextJobID (void); +void InitJobIDs (void); +void FreeJobIDs (void); int FreeJobID (int ID); -void InitJobs (); -void FreeJobs (); - -Job *NextJob (); +void InitJobs (void); +void FreeJobs (void); + +Job *NextJob (void); Job *FindJob (int JobID); -void ListJobs (); +void ListJobs (void); Job *CreateJob (Task *task); int SubmitJob (Job *job); @@ -217,8 +217,8 @@ void FreeJob (Job *job); -float CheckJobs (); -float CheckTasks (); -int CheckSystem (); -int CheckController (); +float CheckJobs (void); +float CheckTasks (void); +int CheckSystem (void); +int CheckController (void); int CheckTimeRanges (TimeRange *ranges, int Nranges); int BumpTimeRanges (TimeRange *ranges, int Nranges); @@ -230,29 +230,29 @@ int DeleteControllerJob (Job *job); Job *FindControllerJob (int JobID); -int StartController (); +int StartController (void); int ControllerCommand (char *command, char *response, IOBuffer *buffer); int SubmitLocalJob (Job *job); int CheckLocalJob (Job *job); int CheckLocalJobStatus (Job *job); -void InitTaskTimers (); +void InitTaskTimers (void); CommandF *FindControllerCommand (char *cmd); -int QuitController (); -int StopController (); -int RestartController (); -int VerboseMode (); +int QuitController (void); +int StopController (void); +int RestartController (void); +int VerboseMode (void); int KillLocalJob (Job *job); -int CheckControllerOutput (); -int PrintControllerOutput (); +int CheckControllerOutput (void); +int PrintControllerOutput (void); int AddHost (char *hostname, int max_threads); int DeleteHost (char *hostname); -int FlushControllerOutput (); +int FlushControllerOutput (void); int KillControllerJob (Job *job); -int CheckControllerStatus (); +int CheckControllerStatus (void); void gotsignal (int signum); int client_shell (int argc, char **argv); -void InitClients (); +void InitClients (void); void AddNewClient (int client); int DeleteClient (int client); @@ -261,31 +261,31 @@ // functions related to the server threads void CheckTasksSetState (int state); -int CheckTasksGetState (); +int CheckTasksGetState (void); void *CheckTasksThread (void *data); void CheckJobsSetState (int state); -int CheckJobsGetState (); +int CheckJobsGetState (void); void *CheckJobsThread (void *data); void CheckControllerSetState (int state); -int CheckControllerGetState (); +int CheckControllerGetState (void); void *CheckControllerThread (void *data); void CheckInputsSetState (int state); -int CheckInputsGetState (); +int CheckInputsGetState (void); void *CheckInputsThread (void *data); // functions related to the queue of input files -void InitInputs (); -void FreeInputs (); +void InitInputs (void); +void FreeInputs (void); void AddNewInput (char *input); int DeleteInput (char *input); -void CheckInputs (); - -void SerialThreadLock (); -void SerialThreadUnlock (); - -int InitPassword (); +void CheckInputs (void); + +void SerialThreadLock (void); +void SerialThreadUnlock (void); + +int InitPassword (void); int CheckPassword (int BindSocket); -int FlushJobs (); +int FlushJobs (void); Index: trunk/Ohana/src/opihi/include/pclient.h =================================================================== --- trunk/Ohana/src/opihi/include/pclient.h (revision 21086) +++ trunk/Ohana/src/opihi/include/pclient.h (revision 21153) @@ -44,11 +44,11 @@ IOBuffer child_stderr; -int InitChild (); -int FreeChild (); -int CheckChild (); -void CheckChildStatus (); +int InitChild (void); +int FreeChild (void); +int CheckChild (void); +void CheckChildStatus (void); -void InitPclient (); -void FreePclient (); +void InitPclient (void); +void FreePclient (void); void gotsignal (int signum); Index: trunk/Ohana/src/opihi/include/pcontrol.h =================================================================== --- trunk/Ohana/src/opihi/include/pcontrol.h (revision 21086) +++ trunk/Ohana/src/opihi/include/pcontrol.h (revision 21153) @@ -154,9 +154,9 @@ // # define ABORT(STRING) { gprint (GP_ERR, "programming error: %s\n", STRING); raise (SIGINT); exit (2); } -void InitPcontrol (); -void FreePcontrol (); +void InitPcontrol (void); +void FreePcontrol (void); /*** StackOps.c ***/ -Stack *InitStack (); +Stack *InitStack (void); void FreeStack (Stack *stack); int PushStack (Stack *stack, int where, void *object, int id, char *name); @@ -173,5 +173,5 @@ /*** CheckSystem.c ***/ -int CheckSystem (); +int CheckSystem (void); void *CheckSystem_Threaded (void *data); int CheckBusyJobs (float delay); @@ -214,22 +214,22 @@ /*** misc files ***/ -int VerboseMode (); // in verbose.c +int VerboseMode (void); // in verbose.c void gotsignal (int signum); // in pcontrol.c /*** IDops.c ***/ -void InitIDs (); -IDtype NextJobID (); -IDtype NextHostID (); +void InitIDs (void); +IDtype NextJobID (void); +IDtype NextHostID (void); void PrintID (gpDest dest, IDtype ID); IDtype GetID (char *IDword); /*** CheckPoint.c ***/ -int SetCheckPoint (); -int ClearCheckPoint (); -int TestCheckPoint (); +int SetCheckPoint (void); +int ClearCheckPoint (void); +int TestCheckPoint (void); /*** HostOps.c ***/ -void InitHostStacks (); -void FreeHostStacks (); +void InitHostStacks (void); +void FreeHostStacks (void); Stack *GetHostStack (int StackID); char *GetHostStackName (int StackID); @@ -246,5 +246,5 @@ void DownHost (Host *host); void OffHost (Host *host); -int DownHosts (); +int DownHosts (void); int StopHost (Host *host); int StopHostResponse (Host *host); @@ -254,6 +254,6 @@ int InitJobOutput (JobOutput *output); int ResetJobOutput (JobOutput *output); -void InitJobStacks (); -void FreeJobStacks (); +void InitJobStacks (void); +void FreeJobStacks (void); Stack *GetJobStack (int StackID); char *GetJobStackName (int StackID); Index: trunk/Ohana/src/opihi/include/shell.h =================================================================== --- trunk/Ohana/src/opihi/include/shell.h (revision 21086) +++ trunk/Ohana/src/opihi/include/shell.h (revision 21153) @@ -16,5 +16,5 @@ typedef enum {GP_LOG, GP_ERR} gpDest; -typedef int CommandF (); +typedef int CommandF (int argc, char **argv); typedef struct sockaddr_in SockAddress; @@ -65,7 +65,7 @@ int opihi PROTO((int argc, char **argv)); int multicommand PROTO((char *line)); -int getServer (); +int getServer (void); void multicommand_InitServer PROTO((void)); -void multicommand_StopServer (); +void multicommand_StopServer (void); int command PROTO((char *line, char **outline, int VERBOSE)); @@ -74,5 +74,5 @@ char *parse PROTO((char *line)); char **parse_commands PROTO((char *, int *)); -void welcome PROTO(()); +void welcome PROTO((void)); int add_listentry PROTO((int ThisList, char *line)); @@ -85,11 +85,11 @@ int is_task_exec PROTO((char *line)); int is_macro_create PROTO((char *line)); -void InitLists PROTO(()); -int current_list_depth (); -int increase_list_depth (); -int decrease_list_depth (); +void InitLists PROTO((void)); +int current_list_depth (void); +int increase_list_depth (void); +int decrease_list_depth (void); char *get_next_listentry (int ThisList); -void InitCommands PROTO(()); +void InitCommands PROTO((void)); void AddCommand PROTO((Command *new)); int DeleteCommand PROTO((Command *command)); @@ -105,5 +105,5 @@ int GetMacroDepth PROTO((void)); void ListMacro PROTO((Macro *macro)); -void ListMacros PROTO(()); +void ListMacros PROTO((void)); void FreeMacro PROTO((Macro *macro)); CommandF *find_macro_command PROTO((char *name)); @@ -151,9 +151,9 @@ char *memstr PROTO((char *m1, char *m2, int n)); int write_fmt PROTO((int fd, char *format, ...)); -char *opihi_version PROTO(()); +char *opihi_version PROTO((void)); char *strip_version PROTO((char *input)); /* gprint functions */ -void gprintInit PROTO(()); +void gprintInit PROTO((void)); gpStream *gprintGetStream PROTO((gpDest dest)); void gprintSetBuffer PROTO((gpDest dest)); @@ -172,12 +172,12 @@ int GetClientSocket (char *hostname); int InitServerSocket_Named (char *hostname, SockAddress *Address); -int DefineValidIP (); +int DefineValidIP (void); -void FreeCommands (); -void FreeMacros (); -void FreeBuffers (); -void FreeVectors (); -void FreeVariables (); -void FreeLists (); +void FreeCommands (void); +void FreeMacros (void); +void FreeBuffers (void); +void FreeVectors (void); +void FreeVariables (void); +void FreeLists (void); # endif Index: trunk/Ohana/src/photdbc/include/photdbc.h =================================================================== --- trunk/Ohana/src/photdbc/include/photdbc.h (revision 21086) +++ trunk/Ohana/src/photdbc/include/photdbc.h (revision 21153) @@ -111,4 +111,4 @@ void TrapSignal (int sig); void SetProtect (int mode); -int SetSignals (); +int SetSignals (void); int copy_images (char *outdir); Index: trunk/Ohana/src/relastro/include/relastro.h =================================================================== --- trunk/Ohana/src/relastro/include/relastro.h (revision 21086) +++ trunk/Ohana/src/relastro/include/relastro.h (revision 21153) @@ -139,11 +139,11 @@ int args PROTO((int argc, char **argv)); int bcatalog PROTO((Catalog *subcatalog, Catalog *catalog)); -void clean_images PROTO(()); +void clean_images PROTO((void)); void clean_measures PROTO((Catalog *catalog, int Ncatalog, int final)); -void clean_mosaics PROTO(()); +void clean_mosaics PROTO((void)); void clean_stars PROTO((Catalog *catalog, int Ncatalog)); int corner_check PROTO((double *x1, double *y1, double *x2, double *y2)); -void dumpGrid PROTO(()); -void dump_grid PROTO(()); +void dumpGrid PROTO((void)); +void dump_grid PROTO((void)); int edge_check PROTO((double *x1, double *y1, double *x2, double *y2)); void findImages PROTO((Catalog *catalog, int Ncatalog)); @@ -154,5 +154,5 @@ void TrapSignal (int sig); void SetProtect (int mode); -int SetSignals (); +int SetSignals (void); GSCRegion *find_regions PROTO((Image *image, int Nimage, int *Nregions, GSCRegion *fullregion)); @@ -202,8 +202,8 @@ void plot_defaults PROTO((Graphdata *graphdata)); void plot_grid PROTO((Catalog *catalog)); -void plot_images PROTO(()); +void plot_images PROTO((void)); void plot_list PROTO((Graphdata *graphdata, double *xlist, double *ylist, int N, char *label, char *file)); void plot_mosaic_fields PROTO((Catalog *catalog)); -void plot_mosaics PROTO(()); +void plot_mosaics PROTO((void)); void plot_scatter PROTO((Catalog *catalog, int Ncatalog)); void plot_star_coords PROTO((Catalog *catalog, int Ncatalog)); @@ -212,5 +212,5 @@ int setExclusions PROTO((Catalog *catalog, int Ncatalog)); void setMcal PROTO((Catalog *catalog, int Poor)); -void setMcalFinal PROTO(()); +void setMcalFinal PROTO((void)); int setMcalOutput PROTO((Catalog *catalog, int Ncatalog)); void setMgrid PROTO((Catalog *catalog)); @@ -238,5 +238,5 @@ StatType statsStarX PROTO((Catalog *catalog, int Ncatalog)); void wcatalog PROTO((Catalog *catalog)); -void wimages PROTO(()); +void wimages PROTO((void)); void write_coords PROTO((Header *header, Coords *coords)); @@ -289,4 +289,4 @@ float GetAstromError (Measure *measure, int mode); -int relastro_objects (); +int relastro_objects (void); int UpdateObjectOffsets (SkyList *skylist); Index: trunk/Ohana/src/relphot/include/relphot.h =================================================================== --- trunk/Ohana/src/relphot/include/relphot.h (revision 21086) +++ trunk/Ohana/src/relphot/include/relphot.h (revision 21153) @@ -125,11 +125,11 @@ int args PROTO((int argc, char **argv)); int bcatalog PROTO((Catalog *subcatalog, Catalog *catalog)); -void clean_images PROTO(()); +void clean_images PROTO((void)); void clean_measures PROTO((Catalog *catalog, int Ncatalog, int final)); -void clean_mosaics PROTO(()); +void clean_mosaics PROTO((void)); void clean_stars PROTO((Catalog *catalog, int Ncatalog)); int corner_check PROTO((double *x1, double *y1, double *x2, double *y2)); -void dumpGrid PROTO(()); -void dump_grid PROTO(()); +void dumpGrid PROTO((void)); +void dump_grid PROTO((void)); int edge_check PROTO((double *x1, double *y1, double *x2, double *y2)); void findImages PROTO((Catalog *catalog, int Ncatalog)); @@ -140,5 +140,5 @@ void TrapSignal (int sig); void SetProtect (int mode); -int SetSignals (); +int SetSignals (void); void freeGridBins PROTO((int Ncatalog)); @@ -179,8 +179,8 @@ void plot_defaults PROTO((Graphdata *graphdata)); void plot_grid PROTO((Catalog *catalog)); -void plot_images PROTO(()); +void plot_images PROTO((void)); void plot_list PROTO((Graphdata *graphdata, double *xlist, double *ylist, int N, char *label, char *format, ...)); void plot_mosaic_fields PROTO((Catalog *catalog)); -void plot_mosaics PROTO(()); +void plot_mosaics PROTO((void)); void plot_scatter PROTO((Catalog *catalog, int Ncatalog)); void plot_star_coords PROTO((Catalog *catalog, int Ncatalog)); @@ -190,5 +190,5 @@ int setExclusions PROTO((Catalog *catalog, int Ncatalog)); void setMcal PROTO((Catalog *catalog, int Poor)); -void setMcalFinal PROTO(()); +void setMcalFinal PROTO((void)); int setMcalOutput PROTO((Catalog *catalog, int Ncatalog)); void setMgrid PROTO((Catalog *catalog)); @@ -217,5 +217,5 @@ StatType statsStarX PROTO((Catalog *catalog, int Ncatalog)); void wcatalog PROTO((Catalog *catalog)); -void wimages PROTO(()); +void wimages PROTO((void)); void write_coords PROTO((Header *header, Coords *coords)); -int relphot_objects (); +int relphot_objects (void); Index: trunk/Ohana/src/relphot/src/StarOps.c =================================================================== --- trunk/Ohana/src/relphot/src/StarOps.c (revision 21086) +++ trunk/Ohana/src/relphot/src/StarOps.c (revision 21153) @@ -207,4 +207,7 @@ if (isnan(Msys)) continue; + // XXX this is a hack for the 2MASS search; better to save an average value? + if (catalog[i].measure[m].qPSF < 0.85) continue; + list[N] = Msys - catalog[i].measure[m].Mcal; dlist[N] = MAX (catalog[i].measure[m].dM, MIN_ERROR); Index: trunk/Ohana/src/relphot/src/relphot.c =================================================================== --- trunk/Ohana/src/relphot/src/relphot.c (revision 21086) +++ trunk/Ohana/src/relphot/src/relphot.c (revision 21153) @@ -125,5 +125,5 @@ if ((i == 1) || (i == 5) || (i == 9) || (i == 13)) clean_measures (catalog, Ncatalog, FALSE); if ((i == 2) || (i == 6) || (i == 10) || (i == 14)) clean_stars (catalog, Ncatalog); - if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_mosaics (catalog, Ncatalog); + if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_mosaics (); if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_images (); global_stats (catalog, Ncatalog); Index: trunk/Ohana/src/relphot/src/relphot_objects.c =================================================================== --- trunk/Ohana/src/relphot/src/relphot_objects.c (revision 21086) +++ trunk/Ohana/src/relphot/src/relphot_objects.c (revision 21153) @@ -4,4 +4,5 @@ int i, j, k, m; + int Nsecfilt; SkyTable *sky = NULL; @@ -39,6 +40,15 @@ // XXX consider what gets reset (only PHOTOM flags) if (RESET) { + Nsecfilt = catalog.Nsecfilt; for (j = 0; j < catalog.Naverage; j++) { catalog.average[j].code = 0; + for (k = 0; k < Nsecfilt; k++) { + catalog.secfilt[j*Nsecfilt + k].M = NAN; + catalog.secfilt[j*Nsecfilt + k].dM = NAN; + catalog.secfilt[j*Nsecfilt + k].Xm = NAN_S_SHORT; + catalog.secfilt[j*Nsecfilt + k].Ncode = 0; + catalog.secfilt[j*Nsecfilt + k].Nused = 0; + catalog.secfilt[j*Nsecfilt + k].dummy = 0; + } m = catalog.average[j].measureOffset; for (k = 0; k < catalog.average[j].Nmeasure; k++) { Index: trunk/Ohana/src/uniphot/include/uniphot.h =================================================================== --- trunk/Ohana/src/uniphot/include/uniphot.h (revision 21086) +++ trunk/Ohana/src/uniphot/include/uniphot.h (revision 21153) @@ -73,7 +73,7 @@ void PlotVector PROTO((int Npts, double *vect, int mode, int N)); void PrepPlotting PROTO((int Npts, Graphdata *graphmode, int N)); -void XDead PROTO(()); +void XDead PROTO((void)); int args PROTO((int argc, char **argv)); -void dumpresult PROTO(()); +void dumpresult PROTO((void)); Group *find_image_sgroups PROTO((FITS_DB *db, ImageLink **imlink, int *Nsgroup)); Group *find_image_tgroups PROTO((FITS_DB *db, ImageLink **imlink, int *Ntgroup)); @@ -101,5 +101,5 @@ void TrapSignal (int sig); void SetProtect (int mode); -int SetSignals (); +int SetSignals (void); int subset_images (FITS_DB *db); void update (FITS_DB *db, Group *sgroup, int Nsgroup);