From 007a78a5e3a043cbc7e2777ab033b81b8acbbe71 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 19 Jun 2000 15:48:23 +0000 Subject: [PATCH] r100: moved files --- ChangeLog | 5 +- Makefile.am | 4 +- configure.in | 10 +- include/Makefile.am | 2 +- include/ct.h | 160 ++++++++++++++++++++++++++++++- include/ir.h | 201 --------------------------------------- include/kmath.h | 31 +++--- include/scanner.h | 16 +++- libctsim/Makefile.am | 2 +- libctsupport/Makefile.am | 2 +- src/Makefile.am | 6 +- 11 files changed, 208 insertions(+), 231 deletions(-) delete mode 100644 include/ir.h diff --git a/ChangeLog b/ChangeLog index 1fcd9b2..0551cc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ -1.9.1 - 6/20/2000 +1.9.2 - 6/20/2000 Converted all file i/o to C++ library +1.9.1 - 6/20/2000 + Renamed directories, moved source files, combined source files + 1.9.0 - 6/15/2000 Skip versions to make version 2.0 the first C++ version Renamed Raysums to Projections throughout files diff --git a/Makefile.am b/Makefile.am index f6df4d1..e68341e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,12 +5,12 @@ EXTRA_DIRS1= endif if HAVE_SGP -EXTRA_DIRS2=libezplot libgraph +EXTRA_DIRS2=libctgraphics else EXTRA_DIRS2= endif -SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libcio libk libkmath libir src man html cgi-bin include +SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libctsupport libctsim src man html cgi-bin include EXTRA_DIST=acsite.m4 make.bat diff --git a/configure.in b/configure.in index 7814d8e..658cf51 100644 --- a/configure.in +++ b/configure.in @@ -284,8 +284,8 @@ if test "$no_x" != "yes" ; then AC_DEFINE(HAVE_X11) AC_DEFINE(HAVE_SGP) AM_CONDITIONAL(HAVE_SGP, test 1==1) - LDFLAGS="$LDFLAGS -L../libezplot -L../libgraph -L/usr/X11R6/lib" - ctlibs_graphics="$ctlibs_base -lezplot -lgraph $X_BASIC_LIBS $X_TOOLKIT_LIBS" + LDFLAGS="$LDFLAGS -L../libctgraphics -L/usr/X11R6/lib" + ctlibs_graphics="$ctlibs_base -lctgraphics $X_BASIC_LIBS $X_TOOLKIT_LIBS" AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -305,8 +305,8 @@ if test "$wx_gtk" = "true" ; then fi dnl Setting projet libraries and includes -LDFLAGS="$LDFLAGS -L../libkmath -L../libk -L../libcio -L../libir" -ctlibs="$ctlibs_base -lir $ctlibs_graphics -lkmath -lk -lcio $ctlibs_tools" +LDFLAGS="$LDFLAGS -L../libctsupport -L../libctsim" +ctlibs="$ctlibs_base -lctsim $ctlibs_graphics -lctsupport $ctlibs_tools" AC_SUBST(ctlibs) if test -n "$lamdir" ; then @@ -314,4 +314,4 @@ if test -n "$lamdir" ; then AC_SUBST(lamprograms) fi -AC_OUTPUT(Makefile libezplot/Makefile src/Makefile libgraph/Makefile libkmath/Makefile Makefile libk/Makefile libir/Makefile libcio/Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.sh cgi-bin/ctsim.conf) +AC_OUTPUT(Makefile src/Makefile libctgraphics/Makefile libctsupport/Makefile libctsim/Makefile Makefile man/Makefile cgi-bin/ctsim.cgi cgi-bin/Makefile html/simulate.html html/Makefile include/Makefile getopt/Makefile src/sample-ctrec.sh cgi-bin/ctsim.conf) diff --git a/include/Makefile.am b/include/Makefile.am index 901cad4..64baad3 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,4 @@ -noinst_HEADERS=ascii.h cio.h ct.h ezplot.h ir.h keyboard.h kmath.h kstddef.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h byteorder.h phantom.h timer.h sstream scanner.h projections.h +noinst_HEADERS=ascii.h cio.h ct.h ezplot.h keyboard.h kmath.h kstddef.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h byteorder.h phantom.h timer.h sstream scanner.h projections.h diff --git a/include/ct.h b/include/ct.h index 937a885..2b59b41 100644 --- 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.16 2000/06/18 10:27:11 kevin Exp $ +** $Id: ct.h,v 1.17 2000/06/19 15:48:23 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 @@ -139,9 +139,165 @@ using namespace std; #include "phantom.h" #include "projections.h" #include "scanner.h" -#include "ir.h" + +//----------------------------------------------------------------------// +// USER SYMBOLS // +//----------------------------------------------------------------------// + +// Filter types +static const char O_FILTER_ABS_BANDLIMIT_STR[]= "abs_bandlimit"; +static const char O_FILTER_ABS_SINC_STR[]= "abs_sinc"; +static const char O_FILTER_ABS_COS_STR[]= "abs_cos"; +static const char O_FILTER_ABS_HAMMING_STR[]= "abs_hamming"; +static const char O_FILTER_SHEPP_STR[]= "shepp"; +static const char O_FILTER_BANDLIMIT_STR[]= "bandlimit"; +static const char O_FILTER_SINC_STR[]= "sinc"; +static const char O_FILTER_COS_STR[]= "cos"; +static const char O_FILTER_HAMMING_STR[]= "hamming"; +static const char O_FILTER_TRIANGLE_STR[]= "triangle"; + +typedef enum { + FILTER_BANDLIMIT, + FILTER_SINC, + FILTER_G_HAMMING, + FILTER_COSINE, + FILTER_TRIANGLE, + FILTER_ABS_BANDLIMIT, // filter times |x| + FILTER_ABS_SINC, + FILTER_ABS_G_HAMMING, + FILTER_ABS_COSINE, + FILTER_SHEPP +} FilterType; + + +// Function domains +static const char D_FREQ_STR[]= "freq"; +static const char D_SPATIAL_STR[]= "spatial"; + +typedef enum { + D_FREQ = 1, + D_SPATIAL +} DomainType; + + +/* interpolation methods */ +static const char O_INTERP_NEAREST_STR[]= "nearest"; +static const char O_INTERP_LINEAR_STR[]= "linear"; +static const char O_INTERP_BSPLINE_STR[]= "bspline"; + +#undef HAVE_BSPLINE_INTERP +typedef enum { // Interpolation methods + I_NEAREST = 1, // Nearest neighbor +#if HAVE_BSPLINE_INTERP + I_BSPLINE, + I_1BSPLINE, // 1st order B-Spline + I_2BSPLINE, + I_3BSPLINE, +#endif + I_LINEAR // Linear interpolation +} InterpolationType; + + +// Trace levels +static const char O_TRACE_NONE_STR[]= "none"; +static const char O_TRACE_TEXT_STR[]= "text"; +static const char O_TRACE_PHM_STR[]= "phm"; +static const char O_TRACE_RAYS_STR[]= "rays"; +static const char O_TRACE_PLOT_STR[]= "plot"; +static const char O_TRACE_CLIPPING_STR[]= "clipping"; + +enum { + TRACE_NONE, /* No tracing */ + TRACE_TEXT, /* Minimal status */ + TRACE_PHM, /* Show phantom */ + TRACE_RAYS, /* Show all rays */ + TRACE_PLOT, /* Plot raysums */ + TRACE_CLIPPING /* Plot clipping */ +}; + +// Standard phantomsa +static const char O_PHM_HERMAN_STR[]= "herman"; +static const char O_PHM_ROWLAND_STR[]= "rowland"; +static const char O_PHM_BROWLAND_STR[]= "browland"; +static const char O_PHM_UNITPULSE_STR[]= "unitpulse"; +typedef enum { + O_PHM_HERMAN, /* Herman head phantom */ + O_PHM_ROWLAND, /* Rowland head phantom */ + O_PHM_BROWLAND, /* Bordered Rowland head phantom */ + O_PHM_UNITPULSE /* Unit pulse phantom */ +} PhantomType; + +// Backproject types +static const char O_BPROJ_TRIG_STR[]= "trig"; +static const char O_BPROJ_TABLE_STR[]= "table"; +static const char O_BPROJ_DIFF_STR[]= "diff"; +static const char O_BPROJ_DIFF2_STR[]= "diff2"; +static const char O_BPROJ_IDIFF2_STR[]= "idiff2"; + +typedef enum { + O_BPROJ_TRIG, + O_BPROJ_TABLE, + O_BPROJ_DIFF, + O_BPROJ_DIFF2, + O_BPROJ_IDIFF2 +} BackprojType; + +// Convolution symmetries +typedef enum { + FUNC_EVEN = 1, // function types, f[-n] = f[n] + FUNC_ODD, // f[-n] = -f[n] + FUNC_BOTH // function has both odd & even components +} FunctionSymmetry; + + + #include "backprojectors.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); +int opt_set_phantom(const char *optarg); +InterpolationType opt_set_interpolation(const char *optarg); +const char *name_of_interpolation(int interp_type); +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); +BackprojType opt_set_backproj(const char *optarg); +const char *name_of_backproj(const BackprojType backproj); + +// 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); + +// image.cpp +void image_filter_response(ImageFile& im, const DomainType domain, double bw, const FilterType filt_type, double filt_param, const int opt_trace); +int image_display (const ImageFile& im); +int image_display_scale (const ImageFile& im, const int scale, const double pmin, const double pmax); + +// From reconstr.cpp +ImageFile& proj_reconst (ImageFile& im, Projections& rs, const FilterType filt_type, double filt_param, InterpolationType interp_type, int interp_param, const BackprojType backproj_type, int const ir_trace); + #endif diff --git a/include/ir.h b/include/ir.h deleted file mode 100644 index 8af8572..0000000 --- a/include/ir.h +++ /dev/null @@ -1,201 +0,0 @@ -/***************************************************************************** -** FILE IDENTIFICATION -** -** Name: ir.h -** Purpose: Master Image Reconstruction Header -** Programmer: Kevin Rosenberg -** Date Started: July 1, 1984 -** -** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg -** -** $Id: ir.h,v 1.28 2000/06/17 20:12:14 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 -** published by the Free Software Foundation. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -******************************************************************************/ - -#ifndef IR_H -#define IR_H - - -#include "phantom.h" -#include "scanner.h" -#include "projections.h" - -/*----------------------------------------------------------------------*/ -/* USER SYMBOLS */ -/*----------------------------------------------------------------------*/ - -/* Codes for Filter types */ - -typedef enum { /* filter types for filter_generate() */ - FILTER_BANDLIMIT, - FILTER_SINC, - FILTER_G_HAMMING, - FILTER_COSINE, - FILTER_TRIANGLE, - FILTER_ABS_BANDLIMIT, /* filter times |x| */ - FILTER_ABS_SINC, - FILTER_ABS_G_HAMMING, - FILTER_ABS_COSINE, - FILTER_SHEPP -} FilterType; - -/* function domains */ - -static const char D_FREQ_STR[]= "freq"; -static const char D_SPATIAL_STR[]= "spatial"; - -typedef enum { - D_FREQ = 1, - D_SPATIAL -} DomainType; - -typedef enum { - FUNC_EVEN = 1, /* function types, f[-n] = f[n] */ - FUNC_ODD, /* f[-n] = -f[n] */ - FUNC_BOTH /* function has both odd & even components */ -} FunctionSymmetry; - -/* interpolation methods */ -#undef HAVE_BSPLINE_INTERP -typedef enum { /* Interpolation methods */ - I_NEAREST = 1, /* Nearest neighbor */ -#if HAVE_BSPLINE_INTERP - I_BSPLINE, - I_1BSPLINE, /* 1st order B-Spline */ - I_2BSPLINE, - I_3BSPLINE, -#endif - I_LINEAR /* Linear interpolation */ -} InterpolationType; - -static const char O_TRACE_NONE_STR[]= "none"; -static const char O_TRACE_TEXT_STR[]= "text"; -static const char O_TRACE_PHM_STR[]= "phm"; -static const char O_TRACE_RAYS_STR[]= "rays"; -static const char O_TRACE_PLOT_STR[]= "plot"; -static const char O_TRACE_CLIPPING_STR[]= "clipping"; - -enum { - TRACE_NONE, /* No tracing */ - TRACE_TEXT, /* Minimal status */ - TRACE_PHM, /* Show phantom */ - TRACE_RAYS, /* Show all rays */ - TRACE_PLOT, /* Plot raysums */ - TRACE_CLIPPING /* Plot clipping */ -}; - -typedef enum { - O_PHM_HERMAN, /* Herman head phantom */ - O_PHM_ROWLAND, /* Rowland head phantom */ - O_PHM_BROWLAND, /* Bordered Rowland head phantom */ - O_PHM_UNITPULSE /* Unit pulse phantom */ -} PhantomType; - -static const char O_PHM_HERMAN_STR[]= "herman"; -static const char O_PHM_ROWLAND_STR[]= "rowland"; -static const char O_PHM_BROWLAND_STR[]= "browland"; -static const char O_PHM_UNITPULSE_STR[]= "unitpulse"; - -static const char O_INTERP_NEAREST_STR[]= "nearest"; -static const char O_INTERP_LINEAR_STR[]= "linear"; -static const char O_INTERP_BSPLINE_STR[]= "bspline"; - -static const char O_FILTER_ABS_BANDLIMIT_STR[]= "abs_bandlimit"; -static const char O_FILTER_ABS_SINC_STR[]= "abs_sinc"; -static const char O_FILTER_ABS_COS_STR[]= "abs_cos"; -static const char O_FILTER_ABS_HAMMING_STR[]= "abs_hamming"; -static const char O_FILTER_SHEPP_STR[]= "shepp"; -static const char O_FILTER_BANDLIMIT_STR[]= "bandlimit"; -static const char O_FILTER_SINC_STR[]= "sinc"; -static const char O_FILTER_COS_STR[]= "cos"; -static const char O_FILTER_HAMMING_STR[]= "hamming"; -static const char O_FILTER_TRIANGLE_STR[]= "triangle"; - -typedef enum { - O_BPROJ_TRIG, - O_BPROJ_TABLE, - O_BPROJ_DIFF, - O_BPROJ_DIFF2, - O_BPROJ_IDIFF2 -} BackprojType; - -static const char O_BPROJ_TRIG_STR[]= "trig"; -static const char O_BPROJ_TABLE_STR[]= "table"; -static const char O_BPROJ_DIFF_STR[]= "diff"; -static const char O_BPROJ_DIFF2_STR[]= "diff2"; -static const char O_BPROJ_IDIFF2_STR[]= "idiff2"; - -const static int RAYSUM_TRACE_ROW_TITLE=1; -const static int RAYSUM_TRACE_ROW_TITLE2=2; -const static int RAYSUM_TRACE_ROW_PHANT_ID=4; -const static int RAYSUM_TRACE_ROW_CHROMATIC=7; -const static int RAYSUM_TRACE_ROW_SCATTER=8; -const static int RAYSUM_TRACE_ROW_PHOT_STAT=9; -const static int RAYSUM_TRACE_ROW_NDET=12; -const static int RAYSUM_TRACE_ROW_NVIEW=13; -const static int RAYSUM_TRACE_ROW_SAMPLES=14; -const static int RAYSUM_TRACE_ROW_CURR_VIEW=17; -const static int RAYSUM_TRACE_ROW_ATTEN=18; - - - -/************************************************************************* - * 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); -int opt_set_phantom(const char *optarg); -InterpolationType opt_set_interpolation(const char *optarg); -const char *name_of_interpolation(int interp_type); -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); -BackprojType opt_set_backproj(const char *optarg); -const char *name_of_backproj(const BackprojType backproj); - -/* 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); - -/* image.cpp */ -void image_filter_response(ImageFile& im, const DomainType domain, double bw, const FilterType filt_type, double filt_param, const int opt_trace); -int image_display (const ImageFile& im); -int image_display_scale (const ImageFile& im, const int scale, const double pmin, const double pmax); - -/* From reconstr.cpp */ -ImageFile& proj_reconst (ImageFile& im, Projections& rs, const FilterType filt_type, double filt_param, InterpolationType interp_type, int interp_param, const BackprojType backproj_type, int const ir_trace); - -#endif diff --git a/include/kmath.h b/include/kmath.h index 0ed4f2a..e4c577b 100644 --- a/include/kmath.h +++ b/include/kmath.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: kmath.h,v 1.15 2000/06/18 10:27:11 kevin Exp $ +** $Id: kmath.h,v 1.16 2000/06/19 15:48:23 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 @@ -80,28 +80,33 @@ inline void minmax_array (const T* array, const int n, T& min, T& max) max = array[i]; } -/* clip.cpp */ -int clip_rect(double *x1, double *y1, double *x2, double *y2, const double rect[4]); -int clip_segment(double *x1, double *y1, double *x2, double *y2, const double u, const double v); -int clip_sector(double *x1, double *y1, double *x2, double *y2, const double u, const double v); -int clip_circle(double *x1, double *y1, double *x2, double *y2, const double cx, const double cy, const double radius, double t1, double t2); -int clip_triangle(double *x1, double *y1, double *x2, double *y2, const double u, const double v, const int clip_xaxis); -/* norm_ang.cpp */ -double norm_ang(double theta); +////////////////////////////////////////////////////////////// +// FUNTION DECLARATIONS +////////////////////////////////////////////////////////////// -/* xform.cpp */ +// clip.cpp +int clip_rect(double& x1, double& y1, double& x2, double& y2, const double rect[4]); +int clip_segment(double& x1, double& y1, double& x2, double& y2, const double u, const double v); +int clip_sector(double& x1, double& y1, double& x2, double& y2, const double u, const double v); +int clip_circle(double& x1, double& y1, double& x2, double& y2, const double cx, const double cy, const double radius, double t1, double t2); +int clip_triangle(double& x1, double& y1, double& x2, double& y2, const double u, const double v, const int clip_xaxis); + +// norm_ang.cpp +double norm_ang (double theta); + +// xform.cpp void indent_mtx2(GRFMTX_2D m); void xlat_mtx2(GRFMTX_2D m, const double x, const double y); void scale_mtx2(GRFMTX_2D m, const double sx, const double sy); void rot_mtx2(GRFMTX_2D m, const double theta); void mult_mtx2(GRFMTX_2D m1, GRFMTX_2D m2, GRFMTX_2D result); -void xform_mtx2(GRFMTX_2D m, double *x, double *y); +void xform_mtx2(GRFMTX_2D m, double& x, double& y); void rotate2d(double x[], double y[], int pts, double angle); void xlat2d(double x[], double y[], int pts, double xoffset, double yoffset); void scale2d(double x[], double y[], int pts, double xfact, double yfact); -/* simpson.cpp */ -double simpson(const double xmin, const double xmax, const double *y, const int np); +// simpson.cpp +double integrateSimpson (const double xmin, const double xmax, const double *y, const int np); #endif diff --git a/include/scanner.h b/include/scanner.h index 8c5ab45..aebf7d1 100644 --- a/include/scanner.h +++ b/include/scanner.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: scanner.h,v 1.1 2000/06/17 20:12:14 kevin Exp $ +** $Id: scanner.h,v 1.2 2000/06/19 15:48:23 kevin Exp $ ** ** ** This program is free software; you can redistribute it and/or modify @@ -113,4 +113,18 @@ class Scanner }; +const static int RAYSUM_TRACE_ROW_TITLE=1; +const static int RAYSUM_TRACE_ROW_TITLE2=2; +const static int RAYSUM_TRACE_ROW_PHANT_ID=4; +const static int RAYSUM_TRACE_ROW_CHROMATIC=7; +const static int RAYSUM_TRACE_ROW_SCATTER=8; +const static int RAYSUM_TRACE_ROW_PHOT_STAT=9; +const static int RAYSUM_TRACE_ROW_NDET=12; +const static int RAYSUM_TRACE_ROW_NVIEW=13; +const static int RAYSUM_TRACE_ROW_SAMPLES=14; +const static int RAYSUM_TRACE_ROW_CURR_VIEW=17; +const static int RAYSUM_TRACE_ROW_ATTEN=18; + + + #endif diff --git a/libctsim/Makefile.am b/libctsim/Makefile.am index 327a13c..0c1b79b 100644 --- a/libctsim/Makefile.am +++ b/libctsim/Makefile.am @@ -1,5 +1,5 @@ noinst_LIBRARIES = libctsim.a -libir_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp options.cpp convolve.cpp reconstr.cpp phm2image.cpp imagefile.cpp reconstr.cpp phm2image.cpp backprojectors.cpp projections.cpp +libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp options.cpp convolve.cpp reconstr.cpp phm2image.cpp imagefile.cpp reconstr.cpp phm2image.cpp backprojectors.cpp projections.cpp INCLUDES=@my_includes@ EXTRA_DIST=Makefile.nt diff --git a/libctsupport/Makefile.am b/libctsupport/Makefile.am index 5fb10ba..da467e6 100644 --- a/libctsupport/Makefile.am +++ b/libctsupport/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libctsupport.a INCLUDES=@my_includes@ -libk_a_SOURCES= filefuncs.cpp strfuncs.cpp syserror.cpp timedate.cpp byteorder.cpp audio.cpp consoleio.cpp normangle.cpp simpson.cpp xform.cpp clip.cpp +libctsupport_a_SOURCES= filefuncs.cpp strfuncs.cpp syserror.cpp timedate.cpp byteorder.cpp audio.cpp consoleio.cpp normangle.cpp simpson.cpp xform.cpp clip.cpp EXTRA_DIST=Makefile.nt diff --git a/src/Makefile.am b/src/Makefile.am index ec47a60..c6d2339 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,13 +37,13 @@ if USE_LAM CC_LAM = $(lamdir)/bin/balky LAM_EXTRA_SRC = mpiworld.cpp -ctrec-lam: ctrec.cpp mpiworld.cpp +ctrec-lam: ctrec.cpp mpiworld.cpp ../include/ct.h $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI ctrec.cpp -o ctrec-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ -phm2pj-lam: phm2pj.cpp mpiworld.cpp +phm2pj-lam: phm2pj.cpp mpiworld.cpp ../include/ct.h $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2pj.cpp -o phm2pj-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ -phm2if-lam: phm2if.cpp mpiworld.cpp +phm2if-lam: phm2if.cpp mpiworld.cpp ../include/ct.h $(CC_LAM) @DEFS@ $(CFLAGS) $(INCLUDES) -DHAVE_MPI phm2if.cpp -o phm2if-lam $(LDFLAGS) $(LAM_EXTRA_SRC) @ctlibs@ endif -- 2.34.1