From eb33bec27b609785c97a8cece532f2348989d308 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 2 Mar 2001 20:25:11 +0000 Subject: [PATCH] r597: *** empty log message *** --- include/Makefile.in | 2 +- libctsim/Makefile.in | 12 ++++++------ src/Makefile.in | 9 +++++---- tools/phm2pj.cpp | 8 ++++---- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index e5a0dc4..7412119 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -90,7 +90,7 @@ wxcflags = @wxcflags@ wxconfig = @wxconfig@ wxlibs = @wxlibs@ -noinst_HEADERS = ct.h ezplot.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h fnetorderstream.h phantom.h timer.h sstream_subst scanner.h projections.h ctsupport.h filter.h array2dfile.h trace.h transformmatrix.h procsignal.h reconstruct.h plotfile.h hashtable.h fourier.h ctglobals.h dlgezplot.h interpolator.h +noinst_HEADERS = ct.h ezplot.h pol.h sgp.h array2d.h imagefile.h backprojectors.h mpiworld.h fnetorderstream.h phantom.h timer.h sstream_subst scanner.h projections.h ctsupport.h filter.h array2dfile.h trace.h transformmatrix.h procsignal.h reconstruct.h plotfile.h hashtable.h fourier.h ctglobals.h dlgezplot.h interpolator.h ctndicom.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff --git a/libctsim/Makefile.in b/libctsim/Makefile.in index 4ebc7ca..0d6e6e6 100644 --- a/libctsim/Makefile.in +++ b/libctsim/Makefile.in @@ -91,7 +91,7 @@ wxconfig = @wxconfig@ wxlibs = @wxlibs@ noinst_LIBRARIES = libctsim.a -libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp +libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp ctndicom.cpp INCLUDES = @my_includes@ EXTRA_DIST = Makefile.nt @@ -108,7 +108,7 @@ LIBS = @LIBS@ libctsim_a_LIBADD = libctsim_a_OBJECTS = filter.o scanner.o projections.o phantom.o \ imagefile.o backprojectors.o array2dfile.o trace.o procsignal.o \ -reconstruct.o fourier.o globalvars.o +reconstruct.o fourier.o globalvars.o ctndicom.o AR = ar CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -121,10 +121,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP_ENV = --best -DEP_FILES = .deps/array2dfile.P .deps/backprojectors.P .deps/filter.P \ -.deps/fourier.P .deps/globalvars.P .deps/imagefile.P .deps/phantom.P \ -.deps/procsignal.P .deps/projections.P .deps/reconstruct.P \ -.deps/scanner.P .deps/trace.P +DEP_FILES = .deps/array2dfile.P .deps/backprojectors.P .deps/ctndicom.P \ +.deps/filter.P .deps/fourier.P .deps/globalvars.P .deps/imagefile.P \ +.deps/phantom.P .deps/procsignal.P .deps/projections.P \ +.deps/reconstruct.P .deps/scanner.P .deps/trace.P SOURCES = $(libctsim_a_SOURCES) OBJECTS = $(libctsim_a_OBJECTS) diff --git a/src/Makefile.in b/src/Makefile.in index 0a7b4bc..30fc378 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -92,7 +92,8 @@ wxlibs = @wxlibs@ bin_PROGRAMS = ctsim -ctsim_SOURCES = ctsim.cpp docs.cpp views.cpp dialogs.cpp ctsim.h docs.h views.h dialogs.h dlgprojections.cpp dlgprojections.h dlgreconstruct.cpp dlgreconstruct.h graph3dview.cpp graph3dview.h ctsim-map.h ctsim.xpm splash.xpm tips.cpp tips.h threadrecon.cpp threadrecon.h backgroundmgr.cpp backgroundmgr.h backgroundsupr.cpp backgroundsupr.h threadproj.cpp threadproj.h +ctsim_SOURCES = ctsim.cpp docs.cpp views.cpp dialogs.cpp ctsim.h docs.h views.h dialogs.h dlgprojections.cpp dlgprojections.h dlgreconstruct.cpp dlgreconstruct.h graph3dview.cpp graph3dview.h ctsim-map.h ctsim.xpm splash.xpm tips.cpp tips.h threadrecon.cpp threadrecon.h backgroundmgr.cpp backgroundmgr.h backgroundsupr.cpp backgroundsupr.h threadproj.cpp threadproj.h threadraster.cpp threadraster.h + ctsim_DEPENDENCIES = ../libctgraphics/libctgraphics.a ../libctsupport/libctsupport.a ../libctsim/libctsim.a ../include/ct.h ctsim_LDADD = -L../libctgraphics -L../libctsupport -L../libctsim @ctlibs@ @@ -108,7 +109,7 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ctsim_OBJECTS = ctsim.o docs.o views.o dialogs.o dlgprojections.o \ dlgreconstruct.o graph3dview.o tips.o threadrecon.o backgroundmgr.o \ -backgroundsupr.o threadproj.o +backgroundsupr.o threadproj.o threadraster.o ctsim_LDFLAGS = CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -127,8 +128,8 @@ TAR = gtar GZIP_ENV = --best DEP_FILES = .deps/backgroundmgr.P .deps/backgroundsupr.P .deps/ctsim.P \ .deps/dialogs.P .deps/dlgprojections.P .deps/dlgreconstruct.P \ -.deps/docs.P .deps/graph3dview.P .deps/threadproj.P .deps/threadrecon.P \ -.deps/tips.P .deps/views.P +.deps/docs.P .deps/graph3dview.P .deps/threadproj.P \ +.deps/threadraster.P .deps/threadrecon.P .deps/tips.P .deps/views.P SOURCES = $(ctsim_SOURCES) OBJECTS = $(ctsim_OBJECTS) diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp index 37b0c24..0d71d4d 100644 --- a/tools/phm2pj.cpp +++ b/tools/phm2pj.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: phm2pj.cpp,v 1.28 2001/03/01 07:30:49 kevin Exp $ +** $Id: phm2pj.cpp,v 1.29 2001/03/02 20:25:11 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 @@ -52,7 +52,7 @@ static struct option phm2pj_options[] = {0, 0, 0, 0} }; -static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.28 2001/03/01 07:30:49 kevin Exp $"; +static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.29 2001/03/02 20:25:11 kevin Exp $"; void @@ -309,8 +309,8 @@ phm2pj_main (int argc, char* const argv[]) mpiWorld.BcastString (optPhmName); mpiWorld.getComm().Bcast (&opt_rotangle, 1, MPI::DOUBLE, 0); mpiWorld.getComm().Bcast (&dOptFocalLength, 1, MPI::DOUBLE, 0); - mpiWorld.getComm().Bcast (&dOptCenterDetectorLength, 1, MPI::DOUBLE, 0) - mpiWorld.getComm().Bcast (&dOptViewRatio, 1, MPI::DOUBLE, 0); + mpiWorld.getComm().Bcast (&dOptCenterDetectorLength, 1, MPI::DOUBLE, 0); + mpiWorld.getComm().Bcast (&dOptViewRatio, 1, MPI::DOUBLE, 0); mpiWorld.getComm().Bcast (&dOptScanRatio, 1, MPI::DOUBLE, 0); mpiWorld.getComm().Bcast (&opt_nview, 1, MPI::INT, 0); mpiWorld.getComm().Bcast (&opt_ndet, 1, MPI::INT, 0); -- 2.34.1