X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fct.h;h=02992b34be34b70f1954a52a4cd22cdb6e0a77c9;hp=d43353de489df62088cc859d477eb50d5846c714;hb=2451ac413848718a1dd666ce6f6464e974680f47;hpb=013445d4e52c07491291289eb32fa325d9f9f8ff diff --git a/include/ct.h b/include/ct.h index d43353d..02992b3 100644 --- a/include/ct.h +++ b/include/ct.h @@ -1,39 +1,15 @@ /***************************************************************************** -** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg -** -** $Id: ct.h,v 1.11 2000/06/07 10:12:09 kevin Exp $ -** $Log: ct.h,v $ -** Revision 1.11 2000/06/07 10:12:09 kevin -** Upgraded from MPI to MPI++ -** -** Revision 1.10 2000/06/07 07:43:39 kevin -** *** empty log message *** -** -** Revision 1.9 2000/06/07 03:49:54 kevin -** *** empty log message *** -** -** Revision 1.8 2000/06/07 02:30:27 kevin -** Added C++ image files -** -** Revision 1.7 2000/06/07 00:59:38 kevin -** added imagefiles -** -** Revision 1.6 2000/05/24 22:48:17 kevin -** First functional version of SDF library for X-window +** FILE IDENTIFICATION ** -** Revision 1.5 2000/05/11 01:04:44 kevin -** Added Microsoft Windows compatibility +** Name: ct.h +** Purpose: Master header file for CTSim +** Programmer: Kevin Rosenberg +** Date Started: Aug 1984 ** -** Revision 1.4 2000/05/03 19:51:41 kevin -** function renaming for phantoms and phantom elements -** -** Revision 1.3 2000/04/30 19:17:35 kevin -** Set up include files for conditional SGP -** -** Revision 1.2 2000/04/28 14:14:16 kevin -** *** empty log message *** +** This is part of the CTSim program +** Copyright (C) 1983-2000 Kevin Rosenberg ** +** $Id: ct.h,v 1.12 2000/06/09 01:35:33 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -48,9 +24,6 @@ ** along with this program; if not, write to the Free Software ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ -/*---------------------------------------------------------------------*/ -/* HEADER FILE FOR TOMOGRAPY SYSTEM */ -/*---------------------------------------------------------------------*/ #ifndef CT_H #define CT_H @@ -146,6 +119,7 @@ #ifdef HAVE_MPI #include "mpi++.h" +#include "mpiworld.h" #endif #include "kstddef.h" @@ -158,17 +132,16 @@ #include "sgp.h" #endif -#ifdef __cplusplus - #include - #include +#include +#include - using namespace std; - - #include "array2d.h" - #include "imagefile.h" -#endif +using namespace std; +#include "array2d.h" +#include "imagefile.h" #include "ir.h" +#include "backproj.h" + #endif