X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fir.h;h=cadc91b8b465f58472e083d9a55f55e8c08a7fe8;hp=e1661dbf42f0e90f4d0ac3574356675f4849ad1a;hb=2451ac413848718a1dd666ce6f6464e974680f47;hpb=013445d4e52c07491291289eb32fa325d9f9f8ff

diff --git a/include/ir.h b/include/ir.h
index e1661db..cadc91b 100644
--- a/include/ir.h
+++ b/include/ir.h
@@ -1,78 +1,15 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $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 ***
-**
-**  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
-**
-**  Revision 1.17  2000/06/03 06:29:08  kevin
-**  *** empty log message ***
-**
-**  Revision 1.16  2000/05/24 22:48:17  kevin
-**  First functional version of SDF library for X-window
-**
-**  Revision 1.15  2000/05/16 04:33:17  kevin
-**  Updated documentation
-**
-**  Revision 1.14  2000/05/11 14:07:00  kevin
-**  Added support for Windows NT
-**
-**  Revision 1.13  2000/05/08 20:00:48  kevin
-**  ANSI C changes
-**
-**  Revision 1.12  2000/05/07 12:46:19  kevin
-**  made c++ compatible
-**
-**  Revision 1.11  2000/05/05 02:37:31  kevin
-**  renamed phmelm to pelm
-**
-**  Revision 1.10  2000/05/04 18:16:34  kevin
-**  renamed filter definitions
-**
-**  Revision 1.9  2000/05/04 04:29:18  kevin
-**  *** empty log message ***
-**
-**  Revision 1.8  2000/05/04 04:25:55  kevin
-**  Renamed phantom and phantom-element functions/variables
+** FILE IDENTIFICATION
 **
-**  Revision 1.7  2000/05/03 19:51:41  kevin
-**  function renaming for phantoms and phantom elements
+**   Name:          ir.h
+**   Purpose:       Master Image Reconstruction Header
+**   Programmer:    Kevin Rosenberg
+**   Date Started:  July 1, 1984
 **
-**  Revision 1.6  2000/05/03 08:49:49  kevin
-**  Code cleanup
-**
-**  Revision 1.5  2000/05/02 20:00:25  kevin
-**  *** empty log message ***
-**
-**  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 ***
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:43  kevin
-**  Initial CVS import for first public release
+**  This is part of the CTSim program
+**  Copyright (C) 1983-2000 Kevin Rosenberg
 **
+**  $Id: ir.h,v 1.24 2000/06/09 01:35:33 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -89,11 +26,6 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
-/*	ir.h	    Header File for Image Reconstruction System
- *	Programmer:   Kevin Rosenberg
- *	Date Started: 7-1-84
- */
-
 #ifndef IR_H
 #define IR_H
 
@@ -351,28 +283,6 @@ const static int RAYSUM_TRACE_ROW_ATTEN=18;
  *  FUNCTION DECLARATIONS
  ************************************************************************/
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#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 [CT_MPI_MAX_PROCESS];
-  int start_work_unit [CT_MPI_MAX_PROCESS];
-  MPI::Intracomm comm;
-};
-
-extern struct mpi_ct_st mpi_ct;
-void mpi_ct_calc_work_units(const unsigned int global_work_units);
-#endif
-
-
 /* 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);
@@ -435,7 +345,7 @@ int raysum_collect(RAYSUM *rs, const DETECTOR *det, const PHANTOM *phm, const in
 void rayview(const PHANTOM *phm, DETARRAY *darray, const DETECTOR *det, const double xd1, const double yd1, const double xd2, const double yd2, const double xs1, const double ys1, const double xs2, const double ys2, const int unit_pulse);
 double phm_ray_attenuation (const PHANTOM *phm, const double x1, const double y1, const double x2, const double y2);
 double pelm_ray_attenuation (PELM *pelm, const double x1, const double y1, const double x2, const double y2);
-int pelm_clip_line (const PELM *pelm, double *x1, double *y1, double *x2, double *y2);
+int pelm_clip_line (const PELM *pelm, double& x1, double& y1, double& x2, double& y2);
 void raysum_trace_show_param (const char *label, const char *fmt, int row, int color, ...);
 
 /* scanner.c */
@@ -460,9 +370,6 @@ int detarray_read(RAYSUM *rs, DETARRAY *darray, const int view_num);
 int detarray_write(RAYSUM *rs, const DETARRAY *darray, const int view_num);
 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);
@@ -505,8 +412,4 @@ 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 */
-
-
 #endif