X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fir.h;h=e1661dbf42f0e90f4d0ac3574356675f4849ad1a;hp=a257bae391858262949ae611de98823ae6c80969;hb=7438260c07e4f3d71c7f43669678c3a912682e4c;hpb=92a7e95f339442d5d87f0febcae338306e1c6edd

diff --git a/include/ir.h b/include/ir.h
index a257bae..e1661db 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.21 2000/06/07 03:49:54 kevin Exp $
+**  $Id: ir.h,v 1.23 2000/06/07 10:12:09 kevin Exp $
 **  $Log: ir.h,v $
+**  Revision 1.23  2000/06/07 10:12:09  kevin
+**  Upgraded from MPI to MPI++
+**
+**  Revision 1.22  2000/06/07 07:43:39  kevin
+**  *** empty log message ***
+**
 **  Revision 1.21  2000/06/07 03:49:54  kevin
 **  *** empty log message ***
 **
@@ -105,19 +111,6 @@ typedef struct histo_st HISTOGRAM;
 static const int POINTS_PER_CIRCLE=90;
 #define MAXREMARK  99
 
-typedef FMTX_2D         IMAGE_ARRAY;    /* use 2d floating point matrix */
-typedef float           IMAGE_ELEM_VAL;	/* use floats for image storing */
-
-struct image_st {
-    IMAGE_ARRAY v;			/* values of voxels in matrix form */
-    SDF_2D *dfp_2d;			/* Pointer to disk image file */
-    int nx, ny;				/* size of voxel matrix */
-    double xmin, xmax, ymin, ymax;	/* extent of voxel matrix in phm coord */
-    char remark[MAXREMARK+1];		/* description of voxel data */
-    float calctime;			/* time to calculate voxels in seconds */
-};
-typedef struct image_st  IMAGE;
-
 typedef enum {
   RECTANGLE,
   TRIANGLE,
@@ -362,17 +355,17 @@ const static int RAYSUM_TRACE_ROW_ATTEN=18;
 extern "C" {
 #endif /* __cplusplus */
 
-#ifdef MPI_CT
-#define MPI_MAX_PROCESS 128 
+#ifdef HAVE_MPI
+#define CT_MPI_MAX_PROCESS 128 
 struct mpi_ct_st
 {
   int my_rank;
   int nproc;
   int base_local_work_units;
   int remainder_work_units;
-  int local_work_units[MPI_MAX_PROCESS];
-  int start_work_unit[MPI_MAX_PROCESS];
-  MPI_Comm comm;
+  int local_work_units [CT_MPI_MAX_PROCESS];
+  int start_work_unit [CT_MPI_MAX_PROCESS];
+  MPI::Intracomm comm;
 };
 
 extern struct mpi_ct_st mpi_ct;
@@ -380,70 +373,24 @@ void mpi_ct_calc_work_units(const unsigned int global_work_units);
 #endif
 
 
-/* From reconstr.c */
-IMAGE *image_reconst (IMAGE *im, RAYSUM *rs, const FilterType filt_type, double filt_param, InterpolationType interp_type, int interp_param, const BackprojType backproj_type, int const ir_trace);
-
-/* From bproj.c */
-void backproj_init (const RAYSUM *rs, IMAGE *im, const BackprojType bproj_method);
-int  backproj_calc (const RAYSUM *rs, IMAGE *im, const double *t, const double view_angle, 
-		    const int interp_type, const int bproj_method);
-void backproj_term (const RAYSUM *rs, IMAGE *im, const int bproj_method);
-
-void backproj_init_trig (const RAYSUM *rs, IMAGE *im);
-int  backproj_calc_trig (const RAYSUM *rs, IMAGE *im, const double *t, 
-			 const double view_angle, const int interp_type);
-void backproj_term_trig (const RAYSUM *rs, IMAGE *im);
-void backproj_init_table (const RAYSUM *rs, IMAGE *im);
-int  backproj_calc_table (const RAYSUM *rs, IMAGE *im, const double *t, 
-			  const double view_angle, const int interp_type);
-void backproj_term_table (const RAYSUM *rs, IMAGE *im);
-void backproj_init_d (const RAYSUM *rs, IMAGE *im);
-int  backproj_calc_d (const RAYSUM *rs, IMAGE *im, const double *t, 
-		      const double view_angle, const int interp_type);
-void backproj_term_d (const RAYSUM *rs, IMAGE *im);
-void backproj_init_d2 (const RAYSUM *rs, IMAGE *im);
-int  backproj_calc_d2 (const RAYSUM *rs, IMAGE *im, const double *t, 
-		       const double view_angle, const int interp_type);
-void backproj_term_d2 (const RAYSUM *rs, IMAGE *im);
-void backproj_init_id (const RAYSUM *rs, IMAGE *im);
-int  backproj_calc_id (const RAYSUM *rs, IMAGE *im, const double *t, 
-		       const double view_angle, const int interp_type);
-void backproj_term_id (const RAYSUM *rs, IMAGE *im);
-void backproj_init_id2 (const RAYSUM *rs, IMAGE *im);
-int  backproj_calc_id2 (const RAYSUM *rs, IMAGE *im, const double *t, 
-			const double view_angle, const int interp_type);
-void backproj_term_id2 (const RAYSUM *rs, IMAGE *im);
-
-/* bspline.c */
-int bspline(int samples, int zoom_factor, int spline_order, double input[], double output[]);
-
 /* convolve.c */
-double convolve(const double f1[], const double f2[], const double dx, const int n, const int np, const FunctionSymmetry func_type);
-double convolve_both(const double f1[], const double f2[], const double dx, const int n, const int np);
+double convolve (const double f1[], const double f2[], const double dx, const int n, const int np, const FunctionSymmetry func_type);
+double convolve_both (const double f1[], const double f2[], const double dx, const int n, const int np);
 
 /* dialogs.c */
-int phm_add_pelm_kb(PHANTOM *phm);
-PHANTOM *phm_select(void);
-int interpolation_select(void);
-int filter_select(double *filter_param);
+int phm_add_pelm_kb (PHANTOM *phm);
+PHANTOM *phm_select (void);
+int interpolation_select (void);
+int filter_select (double *filter_param);
 
 /* filter.c */
-double *filter_generate(const FilterType filt_type, double bw, double xmin, double xmax, int n, double param, const DomainType domain, int numint);
-double filter_spatial_response_calc(int filt_type, double x, double bw, double param, int n);
-double filter_spatial_response_analytic(int filt_type, double x, double bw, double param);
-double filter_frequency_response(int filt_type, double u, double bw, double param);
-double sinc(double x, double mult);
+double *filter_generate (const FilterType filt_type, double bw, double xmin, double xmax, int n, double param, const DomainType domain, int numint);
+double filter_spatial_response_calc (int filt_type, double x, double bw, double param, int n);
+double filter_spatial_response_analytic (int filt_type, double x, double bw, double param);
+double filter_frequency_response (int filt_type, double u, double bw, double param);
+double sinc (double x, double mult);
 double integral_abscos(double u, double w);
 
-/* image.c */
-IMAGE *image_create(const char *fname, const int nx, const int ny);
-int image_clear(IMAGE *im);
-int image_save(IMAGE *im);
-IMAGE *image_load(const char *fname);
-void image_filter_response(IMAGE *im, const DomainType domain, double bw, const FilterType filt_type, double filt_param, const int opt_trace);
-int image_display (const IMAGE *im);
-int image_display_scale (const IMAGE *im, const int scale, const double pmin, const double pmax);
-
 /* options.c */
 int opt_set_trace(const char *optarg);
 const char *name_of_phantom(const int phmid);
@@ -478,10 +425,6 @@ void phm_show(const PHANTOM *phm);
 void phm_draw(const PHANTOM *phm);
 #endif
 
-/* phm2image.c */
-void phm_to_image(const PHANTOM *phm, IMAGE *im, const int col_start, const int col_count, const int nsample, const int trace);
-int pelm_is_point_inside(PELM *obj, const double x, const double y, const CoordType coord_type);
-
 /* phmstd.c */
 void phm_std_herman (PHANTOM *phm);
 void phm_std_rowland (PHANTOM *phm);
@@ -496,7 +439,7 @@ int pelm_clip_line (const PELM *pelm, double *x1, double *y1, double *x2, double
 void raysum_trace_show_param (const char *label, const char *fmt, int row, int color, ...);
 
 /* scanner.c */
-DETECTOR *detector_create(const PHANTOM *phm, int geometry, int ndet, int nview, int nsample, const double rot_anglen);
+DETECTOR *detector_create(const PHANTOM *phm, const ScannerGeometry geometry, int ndet, int nview, int nsample, const double rot_anglen);
 void detector_free(DETECTOR *det);
 
 /* rayio.c */
@@ -520,7 +463,48 @@ int raysum_print(const RAYSUM *rs);
 #ifdef __cplusplus
 } 
 
+/* From phm2image.cpp */
 void phm_to_imagefile (const PHANTOM *phm, ImageFile& im, const int col_start, const int col_count, const int nsample, const int trace);
+int pelm_is_point_inside(PELM *obj, const double x, const double y, const CoordType coord_type);
+
+/* image.cpp */
+void image_filter_response(ImageFile& im, const DomainType domain, double bw, const FilterType filt_type, double filt_param, const int opt_trace);
+int image_display (const ImageFile& im);
+int image_display_scale (const ImageFile& im, const int scale, const double pmin, const double pmax);
+
+/* From reconstr.cpp */
+ImageFile& proj_reconst (ImageFile& im, RAYSUM *rs, const FilterType filt_type, double filt_param, InterpolationType interp_type, int interp_param, const BackprojType backproj_type, int const ir_trace);
+
+/* From bproj.cpp */
+void backproj_init (const RAYSUM *rs, ImageFile& im, const BackprojType bproj_method);
+int  backproj_calc (const RAYSUM *rs, ImageFile& im, const double *t, const double view_angle, const int interp_type, const int bproj_method);
+void backproj_term (const RAYSUM *rs, ImageFile& im, const int bproj_method);
+
+void backproj_init_trig (const RAYSUM *rs, ImageFile& im);
+int  backproj_calc_trig (const RAYSUM *rs, ImageFile& im, const double *t, 
+			 const double view_angle, const int interp_type);
+void backproj_term_trig (const RAYSUM *rs, ImageFile& im);
+void backproj_init_table (const RAYSUM *rs, ImageFile& im);
+int  backproj_calc_table (const RAYSUM *rs, ImageFile& im, const double *t, 
+			  const double view_angle, const int interp_type);
+void backproj_term_table (const RAYSUM *rs, ImageFile& im);
+void backproj_init_d (const RAYSUM *rs, ImageFile& im);
+int  backproj_calc_d (const RAYSUM *rs, ImageFile& im, const double *t, 
+		      const double view_angle, const int interp_type);
+void backproj_term_d (const RAYSUM *rs, ImageFile& im);
+void backproj_init_d2 (const RAYSUM *rs, ImageFile& im);
+int  backproj_calc_d2 (const RAYSUM *rs, ImageFile& im, const double *t, 
+		       const double view_angle, const int interp_type);
+void backproj_term_d2 (const RAYSUM *rs, ImageFile& im);
+void backproj_init_id (const RAYSUM *rs, ImageFile& im);
+int  backproj_calc_id (const RAYSUM *rs, ImageFile& im, const double *t, 
+		       const double view_angle, const int interp_type);
+void backproj_term_id (const RAYSUM *rs, ImageFile& im);
+void backproj_init_id2 (const RAYSUM *rs, ImageFile& im);
+int  backproj_calc_id2 (const RAYSUM *rs, ImageFile& im, const double *t, 
+			const double view_angle, const int interp_type);
+void backproj_term_id2 (const RAYSUM *rs, ImageFile& im);
+
 
 #endif /* __cplusplus */