X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fir.h;h=5cbc9e21cfcb9be1d1164f79b6a74b89666e119c;hb=44988be2820a83554d63ba264383c9e87807abc8;hp=3cc918a6da7d3f226217716ad8049a7ed9ed6db1;hpb=c15d94034f5f815fc058c49c4b16f48ded042fd9;p=ctsim.git

diff --git a/include/ir.h b/include/ir.h
index 3cc918a..5cbc9e2 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.18 2000/06/05 01:32:45 kevin Exp $
+**  $Id: ir.h,v 1.20 2000/06/07 02:30:27 kevin Exp $
 **  $Log: ir.h,v $
+**  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
+**
 **  Revision 1.18  2000/06/05 01:32:45  kevin
 **  Added C++ compatibility
 **
@@ -82,27 +88,6 @@
 #ifndef IR_H
 #define IR_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#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) */
@@ -268,12 +253,12 @@ static const char D_FREQ_STR[]=    "freq";
 static const char D_SPATIAL_STR[]= "spatial";
  
 typedef enum {
-  D_FREQ,
+  D_FREQ = 1,
   D_SPATIAL 
 } DomainType;
 
 typedef enum {
-    FUNC_EVEN,    /* function types, f[-n] = f[n] */
+    FUNC_EVEN = 1,    /* function types, f[-n] = f[n] */
     FUNC_ODD,     /* f[-n] = -f[n] */
     FUNC_BOTH    /* function has both odd & even components */
 } FunctionSymmetry;
@@ -281,7 +266,7 @@ typedef enum {
 /* interpolation methods */
 #undef HAVE_BSPLINE_INTERP
 typedef enum {     /* Interpolation methods */
-  I_NEAREST,       /* Nearest neighbor */
+  I_NEAREST = 1,       /* Nearest neighbor */
 #if HAVE_BSPLINE_INTERP
   I_BSPLINE,
   I_1BSPLINE,      /* 1st order B-Spline */
@@ -369,8 +354,28 @@ const static int RAYSUM_TRACE_ROW_ATTEN=18;
 /*************************************************************************
  *  FUNCTION DECLARATIONS
  ************************************************************************/
- 
-void usage (const char *program);
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#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);
@@ -440,13 +445,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 */