X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=include%2Fir.h;h=a257bae391858262949ae611de98823ae6c80969;hb=92a7e95f339442d5d87f0febcae338306e1c6edd;hp=0a04c795d74bb149107c832af9b31cbf329711a5;hpb=07b93dbf2b66fa23c5378ab0fa42f9a7f0083380;p=ctsim.git

diff --git a/include/ir.h b/include/ir.h
index 0a04c79..a257bae 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.19 2000/06/07 00:59:38 kevin Exp $
+**  $Id: ir.h,v 1.21 2000/06/07 03:49:54 kevin Exp $
 **  $Log: ir.h,v $
+**  Revision 1.21  2000/06/07 03:49:54  kevin
+**  *** empty log message ***
+**
+**  Revision 1.20  2000/06/07 02:30:27  kevin
+**  Added C++ image files
+**
 **  Revision 1.19  2000/06/07 00:59:38  kevin
 **  added imagefiles
 **
@@ -85,23 +91,6 @@
 #ifndef IR_H
 #define IR_H
 
-#ifdef MPI_CT
-#define 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;
-};
-
-extern struct mpi_ct_st mpi_ct;
-void mpi_ct_calc_work_units(const unsigned int global_work_units);
-#endif
-
 
 struct histo_st {
     int *b;			/* Histogram array (# of elements in each bin) */
@@ -373,7 +362,23 @@ const static int RAYSUM_TRACE_ROW_ATTEN=18;
 extern "C" {
 #endif /* __cplusplus */
 
-void usage (const char *program);
+#ifdef MPI_CT
+#define 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;
+};
+
+extern struct mpi_ct_st mpi_ct;
+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);
@@ -443,13 +448,13 @@ int image_display_scale (const IMAGE *im, const int scale, const double pmin, co
 int opt_set_trace(const char *optarg);
 const char *name_of_phantom(const int phmid);
 int opt_set_phantom(const char *optarg);
-int opt_set_interpolation(const char *optarg);
+InterpolationType opt_set_interpolation(const char *optarg);
 const char *name_of_interpolation(int interp_type);
-int opt_set_filter(const char *optarg);
+FilterType opt_set_filter(const char *optarg);
 const char *name_of_filter(const int filter);
 DomainType opt_set_filter_domain(const char *optarg);
 const char *name_of_filter_domain(const DomainType domain);
-int opt_set_backproj(const char *optarg);
+BackprojType opt_set_backproj(const char *optarg);
 const char *name_of_backproj(const BackprojType backproj);
 
 /* phm.c */
@@ -474,8 +479,7 @@ 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);
+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 */
@@ -515,6 +519,10 @@ int raysum_print(const RAYSUM *rs);
 
 #ifdef __cplusplus
 } 
+
+void phm_to_imagefile (const PHANTOM *phm, ImageFile& im, const int col_start, const int col_count, const int nsample, const int trace);
+
 #endif /* __cplusplus */
 
+
 #endif