From caa021c02677851eb50fdda6d24a1259f901b20b Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 30 Apr 2000 19:17:54 +0000 Subject: [PATCH] r23: *** empty log message *** --- Makefile.am | 8 ++++---- html/ctsim.html | 2 +- r | 3 ++- src/phm2sdf.c | 7 +++++-- src/sample-ctrec.sh | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index b1b74c9..c2d2f85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,13 @@ if INCLUDED_GETOPT_LONG - EXTRA_DIRS1 = getopt +EXTRA_DIRS1=getopt else - EXTRA_DIRS1 = +EXTRA_DIRS1= endif if HAVE_INTERACTIVE_GRAPHICS - EXTRA_DIRS2 = libezplot libgraph +EXTRA_DIRS2=libezplot libgraph else - EXTRA_DIRS2 = +EXTRA_DIRS2= endif SUBDIRS=$(EXTRA_DIRS1) $(EXTRA_DIRS2) libcio libk libkmath libir src man html cgi-bin include diff --git a/html/ctsim.html b/html/ctsim.html index 0f05345..e013614 100644 --- a/html/ctsim.html +++ b/html/ctsim.html @@ -4,7 +4,7 @@

Perform CT Simulation

Select Image and Size

diff --git a/r b/r index 836daf5..157bb2f 100755 --- a/r +++ b/r @@ -1,6 +1,7 @@ aclocal autoconf automake -./configure --prefix=/opt/ctsim --with-cgibin-dir=/opt/apache/cgi-bin --with-cgibin-url=/cgi-bin --with-webdata-dir=/opt/apache/htdocs/ctsim/webdata --with-webdata-url=/ctsim/webdata --with-html-dir=/opt/apache/htdocs/ctsim --with-lam-dir=/opt/lam +./configure --prefix=/opt/ctsim --with-cgibin-dir=/opt/apache/cgi-bin --with-cgibin-url=/cgi-bin --with-webdata-dir=/opt/apache/htdocs/ctsim/webdata --with-webdata-url=/ctsim/webdata --with-html-dir=/opt/apache/htdocs/ctsim --with-lam-dir=/opt/lam --without-x + diff --git a/src/phm2sdf.c b/src/phm2sdf.c index ebc21b6..814951a 100644 --- a/src/phm2sdf.c +++ b/src/phm2sdf.c @@ -2,8 +2,11 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: phm2sdf.c,v 1.4 2000/04/30 04:06:13 kevin Exp $ +** $Id: phm2sdf.c,v 1.5 2000/04/30 19:17:54 kevin Exp $ ** $Log: phm2sdf.c,v $ +** Revision 1.5 2000/04/30 19:17:54 kevin +** *** empty log message *** +** ** Revision 1.4 2000/04/30 04:06:13 kevin ** Update Raysum i/o routines ** Fix MPI bug in ctrec (scatter_raysum) that referenced rs_global @@ -144,7 +147,7 @@ main (const int argc, char *const argv[]) double opt_filter_bw = 1.; int opt_trace = TRACE_NONE; int opt_verbose = 0; - double time_start, time_end; + double time_start=0, time_end=0; #ifdef MPI_CT IMAGE *im_local = NULL; int mpi_argc = argc; diff --git a/src/sample-ctrec.sh b/src/sample-ctrec.sh index 2ef3220..5daa07e 100644 --- a/src/sample-ctrec.sh +++ b/src/sample-ctrec.sh @@ -1,6 +1,6 @@ #!/bin/sh -bin="/usr/local/bin/" +bin="/opt/ctsim/bin/" # Generate phantom image -- 2.34.1