r69: BSpline changes

diff --git a/src/Makefile.am b/src/Makefile.am
index 0f6975c8b357039fe9a81391ab8d45187eb84c17..624aa9136ebf86907430473e39ac1c100cc42457 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,11 @@
-bin_PROGRAMS = sdf2img ctrec phm2rs phm2sdf rs2sdf sdf-1 sdf-2 sdfinfo @lamprograms@
+bin_PROGRAMS = ctsim sdf2img ctrec phm2rs phm2sdf rs2sdf sdf-1 sdf-2 sdfinfo @lamprograms@ 
 bin_SCRIPTS = sample-ctrec.sh
 EXTRA_PROGRAMS = ctrec-lam phm2sdf-lam phm2rs-lam
 INCLUDES=@my_includes@
 EXTRA_DIST=Makefile.nt
 
+ctsim_SOURCES = ctsim.cpp
+ctsim_LDADD = @ctlibs@
 ctrec_SOURCES = ctrec.c 
 ctrec_LDADD=@ctlibs@
 phm2rs_SOURCES=phm2rs.c

diff --git a/src/ctrec.c b/src/ctrec.c
index 01874dd82b8aecaa2c71896645102221af8b121b..a4307512721e83b3a27d1f7d01674047ceef65d5 100644 (file)
--- a/src/ctrec.c
+++ b/src/ctrec.c
@@ -2,8 +2,11 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctrec.c,v 1.12 2000/05/24 22:50:04 kevin Exp $
+**  $Id: ctrec.c,v 1.13 2000/06/05 01:33:25 kevin Exp $
 **  $Log: ctrec.c,v $
+**  Revision 1.13  2000/06/05 01:33:25  kevin
+**  BSpline changes
+**
 **  Revision 1.12  2000/05/24 22:50:04  kevin
 **  Added support for new SGP library
 **
@@ -97,7 +100,9 @@ ctrec_usage (const char *program)
   fprintf(stdout,"   --interp        Interpolation method during backprojection\n");
   fprintf(stdout,"       nearest     Nearest neighbor interpolation\n");
   fprintf(stdout,"       linear      Linear interpolation\n");
+#if HAVE_BSPLINE_INTERP
   fprintf(stdout,"       bspline     B-spline interpolation\n");
+#endif
   fprintf(stdout,"    --filter       Filter name\n");
   fprintf(stdout,"       abs_bandlimit Abs * Bandlimiting (default)\n");
   fprintf(stdout,"       abs_sinc      Abs * Sinc\n");

diff --git a/src/sample-ctrec.sh.in b/src/sample-ctrec.sh.in
index b85e71f615ab57d78e8bf001d3aa2f9f22bf876b..f1485da8a6c6d9be53b843a6fa387e8426e8916c 100755 (executable)
--- a/src/sample-ctrec.sh.in
+++ b/src/sample-ctrec.sh.in
@@ -1,12 +1,17 @@
 #!/bin/sh
 
-bin="@prefix@/bin/"
+if test "$1" != "" ; then
+  bin=$1
+else
+  bin="@prefix@/bin/"
+fi
 
 # Generate phantom image
 
 ${bin}phm2sdf sample-phm.sdf 256 256 --nsample 2 --phantom herman
 if [ -f sample-phm.sdf ] ; then
   ${bin}sdf2img sample-phm.sdf sample-phm.png --format png
+  ${bin}sdf2img sample-phm.sdf sample-phm16.png --format png16
 fi
 
 # Simulate CT data collection and generate raysum sinugram for display
@@ -16,12 +21,14 @@ if [ -f sample-rs.rs ]; then
 fi
 if [ -f sample-rs.sdf ]; then
   ${bin}sdf2img sample-rs.sdf sample-rs.png --format png
+  ${bin}sdf2img sample-rs.sdf sample-rs16.png --format png16
 fi
 
 # Reconstruct raysums and generate image for display
 ${bin}ctrec   sample-rs.rs sample-rec.sdf 256 256 
 if [ -f sample-rec.sdf ]; then 
   ${bin}sdf2img sample-rec.sdf sample-rec.png --format png
+  ${bin}sdf2img sample-rec.sdf sample-rec16.png --format png16
 fi
 
 # Files sample-phm.png, sample-rs.png, and sample-rec.png are ready for display