X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fir.h;h=081e0bc89e1057d440839628f7848df9e9682e7a;hb=a7bc93cf526e313d69b068f0cb866b5ef108eaf0;hp=3493e75ac90769500fdc2e448fa2622b64a78643;hpb=8fc6888d2599bb288f8ff7008994f2b66ecf6d93;p=ctsim.git

diff --git a/include/ir.h b/include/ir.h
index 3493e75..081e0bc 100644
--- a/include/ir.h
+++ b/include/ir.h
@@ -2,8 +2,14 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ir.h,v 1.2 2000/04/28 14:14:16 kevin Exp $
+**  $Id: ir.h,v 1.4 2000/05/02 15:31:39 kevin Exp $
 **  $Log: ir.h,v $
+**  Revision 1.4  2000/05/02 15:31:39  kevin
+**  code cleaning
+**
+**  Revision 1.3  2000/04/29 23:24:29  kevin
+**  *** empty log message ***
+**
 **  Revision 1.2  2000/04/28 14:14:16  kevin
 **  *** empty log message ***
 **
@@ -383,17 +389,12 @@ int cliptriangle(double *x1, double *y1, double *x2, double *y2, const double u,
 double convolve(const double f1[], const double f2[], const double dx, const int n, const int np, const int func_type);
 double convolve_both(const double f1[], const double f2[], const double dx, const int n, const int np);
 /* ctsub.c */
-OBJECT *alloc_obj(int n);
 void dminmax(const double array[], const int pts, double *xmin, double *xmax);
 void rotate2d(double x[], double y[], int pts, double angle);
 void xlat2d(double x[], double y[], int pts, double xoffset, double yoffset);
 void scale2d(double x[], double y[], int pts, double xfact, double yfact);
 int circle_pts(double theta);
 /* filt.c */
-const char *interp_name_of(int interp_type);
-const char *filter_name_of(int filt_type);
-int interp_select(void);
-int filter_select(double *filt_param);
 double d_filtfunc(int filt_type, double x, double bw, double param, int n);
 double filter_freq(int filt_type, double u, double bw, double param);
 double a_filtfunc(int filt_type, double x, double bw, double param);
@@ -422,6 +423,7 @@ int opt_set_trace(const char *optarg, const char *program);
 const char *name_of_picture(const int picnum);
 int opt_set_picture(const char *optarg, const char *program);
 int opt_set_interpolation(const char *optarg, const char *program);
+const char *name_of_interpolation(int interp_type);
 int opt_set_filter(const char *optarg, const char *program);
 const char *name_of_filter(const int filter);
 int opt_set_filter_domain(const char *optarg, const char *program);
@@ -442,6 +444,7 @@ void makeobjxform(OBJECT *obj);
 void calc_arc(double x[], double y[], const int pts, const double xcent, const double ycent, 
 	      const double r, const double start, const double stop);
 void calc_ellipse(double x[], double y[], const int pts, const double u, const double v);
+OBJECT *alloc_obj(void);
 void prt_pic(PICTURE *pic);
 void show_pic(const PICTURE *pic);
 void draw_pic(const PICTURE *pic);
@@ -461,8 +464,8 @@ double calc_rsum(const PICTURE *pic, const double x1, const double y1, const dou
 double calc_objsum(const OBJECT *obj, const double x1, const double y1, const double x2, const double y2);
 int clipobj(const OBJECT *obj, double *x1, double *y1, double *x2, double *y2);
 /* rayio.c */
-RAYSUM *raysum_create(const char *fname, const int nview, const int ndet, const int in_memory);
-RAYSUM *raysum_create_from_det(const char *fname, const DETECTOR *det, const int in_memory);
+RAYSUM *raysum_create(const char *fname, const int nview, const int ndet);
+RAYSUM *raysum_create_from_det(const char *fname, const DETECTOR *det);
 RAYSUM *raysum_open(const char *filename);
 void raysum_alloc_views(RAYSUM *rs);
 void raysum_free(RAYSUM *rs);
@@ -487,6 +490,6 @@ void xlat_mtx2(GRFMTX_2D m, const double x, const double y);
 void scale_mtx2(GRFMTX_2D m, const double sx, const double sy);
 void rot_mtx2(GRFMTX_2D m, const double theta);
 void mult_mtx2(GRFMTX_2D m1, GRFMTX_2D m2, GRFMTX_2D result);
-void xform_mtx2(GRFMTX_2D m, double *x, double *y);
+void xform_mtx2(const GRFMTX_2D m, double *x, double *y);
 
 #endif