Changeset 4797

Timestamp:

Aug 16, 2005, 3:01:26 PM (21 years ago)

Author:

eugene

Message:

moving to internal vs external measure/average: R,D + dR,dD.
NOTE * dR,dD now represent 1.0 arcsec, not 0.01 arcsec.

* all use has been updated to match

also: cleanups to pass Wall,Werror (unused, undeclared, etc)

Location:

trunk/Ohana/src/uniphot

Files:

• include/uniphot.h (modified) (2 diffs)
• src/dumpresult.c (modified) (1 diff)
• src/misc.c (modified) (1 diff)
• src/plotstuff.c (modified) (1 diff)
• src/uniphot.c (modified) (1 diff)
• src/update_catalog.c (modified) (1 diff)
• src/wcatalog.c (modified) (1 diff)
• src/wimages.c (modified) (1 diff)

trunk/Ohana/src/uniphot/include/uniphot.h

@@ -1 +1 @@
 # include <ohana.h>
 # include <dvo.h>
+
+# ifdef ANSI
+#   define F_SETFL      4   
+#   define O_NONBLOCK 0200000  
+#   define       AF_UNIX         1          
+#   define       SOCK_STREAM     1          
+#define ENOENT          2       /* No such file or directory    */
+# endif /* ANSI */
 
 typedef struct {
@@ -48 +56 @@
 enum {black, white, red, orange, yellow, green, blue, indigo, violet};
 
+typedef struct {
+  double xmin, xmax, ymin, ymax;
+  int style, ptype, ltype, etype, color;
+  double lweight, size;
+} Graphdata;
+
 /***** prototypes ****/
-Group *find_image_tgroups (Image *image, ImageLink *imlink, int Nimage, int *Ntgroup);
-Group *find_image_sgroups (Image *image, ImageLink *imlink, int Nimage, int *Nsgroup);
-Image *load_images (int *nimage);
-char *sec_to_date (unsigned long second);
-double sec_to_jd (unsigned long second);
-int main (int argc, char **argv);
-int args (int argc, char **argv);
-int liststats (double *value, double *dvalue, int N, StatType *stats);
-int dms_to_ddd (double *Value, char *string);
-int str_to_radec (double *ra, double *dec, char *str1, char *str2);
-int chk_time (char *line);
-int str_to_time (char *line, unsigned int *second);
-int str_to_dtime (char *line, double *second);
-int Fseek (FILE *f, long offset, int whence);
-unsigned long int jd_to_sec (double jd);
-unsigned long date_to_sec (char *date);
-void initialize (int argc, char **argv);
-void ConfigInit (int *argc, char **argv);
-void fit_tgroup (Group *tgroup, int Ntgroup);
-void fit_sgroup (Group *sgroup, int Nsgroup);
-void initstats (char *mode);
-void sort (unsigned int *X, int N);
-void sortB (double *X, double *Y, int N);
-void sortD (double *X, double *Y, double *Z, int N);
+void          ConfigInit         PROTO((int *argc, char **argv));
+void          DonePlotting       PROTO((Graphdata *graphmode, int N));
+int           Fseek              PROTO((FILE *f, long offset, int whence));
+void          JpegPlot           PROTO((Graphdata *graphmode, int N, char *filename));
+void          PSPlot             PROTO((Graphdata *graphmode, int N, char *filename));
+void          PlotLabel          PROTO((char *string, int N));
+void          PlotVector         PROTO((int Npts, double *vect, int mode, int N));
+void          PrepPlotting       PROTO((int Npts, Graphdata *graphmode, int N));
+void          XDead              PROTO(());
+int           args               PROTO((int argc, char **argv));
+int           chk_time           PROTO((char *line));
+unsigned long date_to_sec        PROTO((char *date));
+int           dms_to_ddd         PROTO((double *Value, char *string));
+void          dumpresult         PROTO(());
+Group        *find_image_sgroups PROTO((Image *image, ImageLink *imlink, int Nimage, int *Nsgroup));
+Group        *find_image_tgroups PROTO((Image *image, ImageLink *imlink, int Nimage, int *Ntgroup));
+void          fit_sgroup         PROTO((Group *sgroup, int Nsgroup));
+void          fit_tgroup         PROTO((Group *tgroup, int Ntgroup));
+int           gcatalog           PROTO((Catalog *catalog));
+void          initialize         PROTO((int argc, char **argv));
+void          initstats          PROTO((char *mode));
+unsigned long jd_to_sec          PROTO((double jd));
+int           liststats          PROTO((double *value, double *dvalue, int N, StatType *stats));
+Image        *load_images        PROTO((int *nimage));
+int           main               PROTO((int argc, char **argv));
+int           open_graph         PROTO((int N));
+char         *sec_to_date        PROTO((unsigned long second));
+double        sec_to_jd          PROTO((unsigned long second));
+void          sort               PROTO((unsigned int *X, int N));
+void          sortB              PROTO((double *X, double *Y, int N));
+void          sortD              PROTO((double *X, double *Y, double *Z, int N));
+int           str_to_dtime       PROTO((char *line, double *second));
+int           str_to_radec       PROTO((double *ra, double *dec, char *str1, char *str2));
+int           str_to_time        PROTO((char *line, unsigned int *second));
+void          update             PROTO((Image *image, int Nimage, Group *sgroup, int Nsgroup));
+void          update_catalog     PROTO((Catalog *catalog, Group *sgroup, int warn));
+void          wcatalog           PROTO((Catalog *catalog));
+void          wimages            PROTO((Image *image, int Nimage));

trunk/Ohana/src/uniphot/src/dumpresult.c

@@ -1 +1 @@
 # include "uniphot.h"
 
-dumpresult () {
+void dumpresult () {
   short Mcal, Mgrp, Mset;
   FILE *f;

trunk/Ohana/src/uniphot/src/misc.c

@@ +1 @@
+# include "uniphot.h"
 
 void sort (unsigned int *X, int N) {

trunk/Ohana/src/uniphot/src/plotstuff.c

@@ -11 +11 @@
 }
 
-typedef struct {
-  double xmin, xmax, ymin, ymax;
-  int style, ptype, ltype, etype, color;
-  double lweight, size;
-} Graphdata;
-
 int open_graph (int N) {
-
-# ifdef ANSI
-#   define F_SETFL      4   
-#   define O_NONBLOCK 0200000  
-#   define       AF_UNIX         1          
-#   define       SOCK_STREAM     1          
-#define ENOENT          2       /* No such file or directory    */
-# endif /* ANSI */
 
   int i, InitSocket, status, addreslen;

trunk/Ohana/src/uniphot/src/uniphot.c

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
-  int i, j, Nimage, Ntgroup, Nsgroup;
+  int i, Nimage, Ntgroup, Nsgroup;
   Group *tgroup, *sgroup;
   Image *image;

trunk/Ohana/src/uniphot/src/update_catalog.c

@@ -1 +1 @@
 # include "uniphot.h"
 
-update_catalog (Catalog *catalog, Group *sgroup, int warn) {
+void update_catalog (Catalog *catalog, Group *sgroup, int warn) {
 
   int i, j, m, found;

trunk/Ohana/src/uniphot/src/wcatalog.c

@@ -1 +1 @@
 # include "uniphot.h"
 
-wcatalog (Catalog *catalog) {
+void wcatalog (Catalog *catalog) {
 
   /** write out catalog, free memory **/

trunk/Ohana/src/uniphot/src/wimages.c

@@ -1 +1 @@
 # include "uniphot.h"
 
-wimages (Image *image, int Nimage) {
+void wimages (Image *image, int Nimage) {
 
   int status, mode;