r115: *** empty log message ***

[ctsim.git] / include / ct.h

diff --git a/include/ct.h b/include/ct.h
index 2b59b411021317b4d663bb16d35cee9e707c8ac7..4dccb3717c237403b5dc59089c0d5531b41dfb1a 100644 (file)
--- a/include/ct.h
+++ b/include/ct.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ct.h,v 1.17 2000/06/19 15:48:23 kevin Exp $
+**  $Id: ct.h,v 1.20 2000/06/20 17:54:51 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
@@ -114,11 +114,8 @@ extern "C" {
 #include "mpiworld.h"
 #endif
 
-#include "kstddef.h"
-#include "kmath.h"
-#include "keyboard.h"
-#include "cio.h"
-#include "byteorder.h"
+#include "ctsupport.h"
+#include "fnetorderstream.h"
 
 #ifdef HAVE_SGP
   #include "ezplot.h"
@@ -131,10 +128,13 @@ extern "C" {
 #include <string>
 #include <iterator>
 #include <algorithm>
+#include <exception>
+#include <stdexcept>
 
 using namespace std;
 
 #include "array2d.h"
+#include "fnetorderstream.h"
 #include "imagefile.h"
 #include "phantom.h"
 #include "projections.h"
@@ -252,29 +252,19 @@ typedef enum {
 
 
 #include "backprojectors.h"
+#include "filter.h"
 
 
 /*************************************************************************
  *  FUNCTION DECLARATIONS
  ************************************************************************/
 
-// convolve.cpp
-double convolve (const double f1[], const double f2[], const double dx, const int n, const int np, const FunctionSymmetry func_type);
-
 // dialogs.cpp 
 bool phm_add_pelem_kb (Phantom& phm);
 const Phantom& phm_select (Phantom& phm);
 int interpolation_select (void);
 int filter_select (double *filter_param);
 
-// filter.cpp 
-double *filter_generate (const FilterType filt_type, double bw, double xmin, double xmax, int n, double param, const DomainType domain, int numint);
-double filter_spatial_response_calc (int filt_type, double x, double bw, double param, int n);
-double filter_spatial_response_analytic (int filt_type, double x, double bw, double param);
-double filter_frequency_response (int filt_type, double u, double bw, double param);
-double sinc (double x, double mult);
-double integral_abscos(double u, double w);
-
 // options.cpp 
 int opt_set_trace(const char *optarg);
 const char *name_of_phantom(const int phmid);