X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=include%2Fct.h;h=02992b34be34b70f1954a52a4cd22cdb6e0a77c9;hb=4b16507e92bb80b09575b28bed66810e33d2681f;hp=656a684d853f9d8bf7b04328148af64e031f6913;hpb=44988be2820a83554d63ba264383c9e87807abc8;p=ctsim.git

diff --git a/include/ct.h b/include/ct.h
index 656a684..02992b3 100644
--- a/include/ct.h
+++ b/include/ct.h
@@ -1,30 +1,15 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: ct.h,v 1.8 2000/06/07 02:30:27 kevin Exp $
-**  $Log: ct.h,v $
-**  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
-**
-**  Revision 1.5  2000/05/11 01:04:44  kevin
-**  Added Microsoft Windows compatibility
-**
-**  Revision 1.4  2000/05/03 19:51:41  kevin
-**  function renaming for phantoms and phantom elements
+** FILE IDENTIFICATION
 **
-**  Revision 1.3  2000/04/30 19:17:35  kevin
-**  Set up include files for conditional SGP
+**   Name:          ct.h
+**   Purpose:       Master header file for CTSim
+**   Programmer:    Kevin Rosenberg
+**   Date Started:  Aug 1984
 **
-**  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
@@ -39,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
@@ -57,16 +39,28 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+  #include <config.h>
 #endif
 #ifdef HAVE_PNG
-#include "png.h"
+  #include "png.h"
 #endif
 #ifdef HAVE_G2_H
-#include "g2.h"
-#ifdef HAVE_X11
-#include "g2_X11.h"
-#endif
+  #ifdef __cplusplus
+  extern "C" { 
+    #include "g2.h" 
+  }
+  #else
+  #include "g2.h"
+  #endif
+  #ifdef HAVE_X11
+    #ifdef __cplusplus
+      extern "C" {
+        #include "g2_X11.h"
+      }
+    #else
+        #include "g2_X11.h"
+    #endif
+  #endif
 #endif
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
@@ -123,14 +117,13 @@
 #include <stdint.h>             /* Standard ints on Linux */
 #endif
 
-#ifdef MPI_CT
-#include "mpi.h"
+#ifdef HAVE_MPI
+#include "mpi++.h"
+#include "mpiworld.h"
 #endif
 
 #include "kstddef.h"
 #include "kmath.h"
-#include "sdf.h"
-#include "ir.h"
 #include "keyboard.h"
 #include "cio.h"
 
@@ -139,15 +132,16 @@
   #include "sgp.h"
 #endif
 
-#ifdef __cplusplus
-  #include <iostream>
-  #include <string>
+#include <iostream>
+#include <string>
 
-  using namespace std;
+using namespace std;
+
+#include "array2d.h"
+#include "imagefile.h"
+#include "ir.h"
+#include "backproj.h"
 
-  #include "array2d.h"
-  #include "imagefile.h"
-#endif
 
 #endif