From ac39e654e1385006647c73b253d4d79ccf09a919 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 2 Apr 2001 03:50:45 +0000 Subject: [PATCH] r659: *** empty log message *** --- ChangeLog | 1 + cgi-bin/ctsim.cgi.in | 5 ++--- html/simulate.html.in | 6 +++--- libctsim/scanner.cpp | 6 ++---- tools/phm2if.cpp | 8 +++----- tools/phm2pj.cpp | 8 +++----- 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 054a02c..6f09892 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,6 +47,7 @@ being included with the distribution [Reported by Ian Kay]. -- sgp.cpp/ezplot.cpp: Improved plotting with markers. -- fixed ctsimtext shell when giving no parameters to function-name + -- phm2if, phm2pj: Updated help messages for renamed phantoms 3.0.3 - Released 2/20/01 diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in index 2025006..49d9435 100755 --- a/cgi-bin/ctsim.cgi.in +++ b/cgi-bin/ctsim.cgi.in @@ -201,6 +201,7 @@ if ($error ne "") { if (open(LOGFILE,">> $logfile")) { flock(LOGFILE,LOCK_EX); seek(LOGFILE, 0, 2); + print LOGFILE "Client Address: $ENV{'REMOTE_ADDR'}\n"; print LOGFILE "Job $tmpid\n"; print LOGFILE $cmdout; print LOGFILE "----------------------------------------------------\n"; @@ -254,8 +255,6 @@ else if (open(JOBFILES,"> $::jobdir/$tmpid")) { flock(JOBFILES,LOCK_EX); - print JOBFILES "gmt_start=$gmt_start\n"; - print JOBFILES "gmt_end=$gmt_end\n"; print JOBFILES "execution_time=$execution_time\n"; print JOBFILES "Phantom_Name=$Phantom_Name\n"; print JOBFILES "Phantom_Nx=$Phantom_Nx\n"; @@ -303,7 +302,7 @@ sub head sub FilterMetaChars { my $var = pop(@_); - $var =~ /^(\w+)$/; + $var =~ /^([-\w]+)$/; $1; } diff --git a/html/simulate.html.in b/html/simulate.html.in index 19282fb..45c8ee6 100644 --- a/html/simulate.html.in +++ b/html/simulate.html.in @@ -21,8 +21,8 @@ parameters on this form, please visit CTSim's online Phantom Name:
G.T. Herman
-Rowland
-Unit Pulse
+Shepp-Logan
+Unit Pulse

Image Size:
Width:
@@ -54,7 +54,7 @@ Number of Detectors:

Number of Rotations:

Focal Length:

Scan Ratio:

-Number of Rays
(samples) per detector:

+Number of Rays
(samples) per detector:

Rotation Angle
as a fraction of a cricle:
diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp index 88f99f0..0319912 100644 --- a/libctsim/scanner.cpp +++ b/libctsim/scanner.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: scanner.cpp,v 1.37 2001/03/18 18:08:25 kevin Exp $ +** $Id: scanner.cpp,v 1.38 2001/04/02 03:49:52 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 @@ -469,10 +469,8 @@ Scanner::projectSingleView (const Phantom& phm, DetectorArray& detArray, const d if (phm.getComposition() == P_UNIT_PULSE) { // put unit pulse in center of view for (int d = 0; d < detArray.nDet(); d++) - if (detArray.nDet() / 2 == d && isOdd (d)) - detval[d] = 1; - else detval[d] = 0; + detval[ detArray.nDet() / 2 ] = 1; } else { for (int d = 0; d < detArray.nDet(); d++) { double xs = xs_maj; diff --git a/tools/phm2if.cpp b/tools/phm2if.cpp index c6755ec..653e635 100644 --- a/tools/phm2if.cpp +++ b/tools/phm2if.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: phm2if.cpp,v 1.23 2001/02/08 21:49:32 kevin Exp $ +** $Id: phm2if.cpp,v 1.24 2001/04/02 03:49:52 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 @@ -51,7 +51,7 @@ static struct option my_options[] = {0, 0, 0, 0} }; -static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.23 2001/02/08 21:49:32 kevin Exp $"; +static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.24 2001/04/02 03:49:52 kevin Exp $"; void phm2if_usage (const char *program) @@ -65,10 +65,8 @@ phm2if_usage (const char *program) std::cout << " --view-ratio View diameter to phantom diameter ratio (default = 1)\n"; std::cout << " --phantom Phantom to use for projection\n"; std::cout << " herman Herman head phantom\n"; - std::cout << " herman-b Herman head phantom (Bordered)\n"; std::cout << " shepp-logan Shepp-Logan head phantom\n"; - std::cout << " shepp-logan-b Shepp-Logan head phantom (Bordered)\n"; - std::cout << " unitpulse Unit pulse phantom\n"; + std::cout << " unit-pulse Unit pulse phantom\n"; std::cout << " --phmfile Generate Phantom from phantom file\n"; std::cout << " --filter Generate Phantom from a filter function\n"; std::cout << " abs_bandlimit Abs * Bandlimiting\n"; diff --git a/tools/phm2pj.cpp b/tools/phm2pj.cpp index 0d71d4d..cfae91f 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.29 2001/03/02 20:25:11 kevin Exp $ +** $Id: phm2pj.cpp,v 1.30 2001/04/02 03:49:52 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.29 2001/03/02 20:25:11 kevin Exp $"; +static const char* g_szIdStr = "$Id: phm2pj.cpp,v 1.30 2001/04/02 03:49:52 kevin Exp $"; void @@ -65,10 +65,8 @@ phm2pj_usage (const char *program) std::cout << " nview Number of rotated views\n"; std::cout << " --phantom Phantom to use for projection\n"; std::cout << " herman Herman head phantom\n"; - std::cout << " herman-b Herman head phantom (Bordered)\n"; std::cout << " shepp-logan Shepp-Logan head phantom\n"; - std::cout << " shepp-logan-b Shepp-Logan head phantom (Bordered)\n"; - std::cout << " unitpulse Unit pulse phantom\n"; + std::cout << " unit-pulse Unit pulse phantom\n"; std::cout << " --phmfile Get Phantom from phantom file\n"; std::cout << " --desc Description of raysum\n"; std::cout << " --nray Number of rays per detector (default = 1)\n"; -- 2.34.1