projects
/
ctsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
549260c
)
r659: *** empty log message ***
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Mon, 2 Apr 2001 03:50:45 +0000
(
03:50
+0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Mon, 2 Apr 2001 03:50:45 +0000
(
03:50
+0000)
ChangeLog
patch
|
blob
|
history
cgi-bin/ctsim.cgi.in
patch
|
blob
|
history
html/simulate.html.in
patch
|
blob
|
history
libctsim/scanner.cpp
patch
|
blob
|
history
tools/phm2if.cpp
patch
|
blob
|
history
tools/phm2pj.cpp
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 054a02cb25ce5f3cce590b344760ebc83f01e0db..6f09892b27660ecb3e5cf5e4cb483f6e49a46aa8 100644
(file)
--- 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
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
3.0.3 - Released 2/20/01
diff --git
a/cgi-bin/ctsim.cgi.in
b/cgi-bin/ctsim.cgi.in
index 2025006484ae36b6eabcff7b93e1c44801cc94ec..49d94357fc7bac7642dfb38a574dd28baac46ca0 100755
(executable)
--- 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);
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";
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);
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";
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(@_);
sub FilterMetaChars
{
my $var = pop(@_);
- $var =~ /^(
\w
+)$/;
+ $var =~ /^(
[-\w]
+)$/;
$1;
}
$1;
}
diff --git
a/html/simulate.html.in
b/html/simulate.html.in
index 19282fbc1c3bd9dd664645533d4001569a916d39..45c8ee6a1a0783e4c277a5024d1b0ea937099a24 100644
(file)
--- a/
html/simulate.html.in
+++ b/
html/simulate.html.in
@@
-21,8
+21,8
@@
parameters on this form, please visit CTSim's online <a href="http://www.ctsim.o
<font size="-1">
Phantom Name:<br>
<INPUT type="radio" name="Phantom_Name" value="herman" checked>G.T. Herman<br>
<font size="-1">
Phantom Name:<br>
<INPUT type="radio" name="Phantom_Name" value="herman" checked>G.T. Herman<br>
-<INPUT type="radio" name="Phantom_Name" value="
rowland">Rowland
<br>
-<INPUT type="radio" name="Phantom_Name" value="unitpulse">Unit Pulse<br>
+<INPUT type="radio" name="Phantom_Name" value="
shepp-logan">Shepp-Logan
<br>
+<INPUT type="radio" name="Phantom_Name" value="unit
-
pulse">Unit Pulse<br>
<p>
Image Size:<br>
Width: <input type="text" name="Phantom_Nx" size="4" value="128"><br>
<p>
Image Size:<br>
Width: <input type="text" name="Phantom_Nx" size="4" value="128"><br>
@@
-54,7
+54,7
@@
Number of Detectors: <input type="text" name="PJ_NDet" size="4" value="200"><p>
Number of Rotations: <input type="text" name="PJ_NRot" size="4" value="200"><p>
Focal Length: <input type="text" name="PJ_FocalLength" size="4" value="2.0"><p>
Scan Ratio: <input type="text" name="PJ_ScanRatio" size="4" value="1.0"><p>
Number of Rotations: <input type="text" name="PJ_NRot" size="4" value="200"><p>
Focal Length: <input type="text" name="PJ_FocalLength" size="4" value="2.0"><p>
Scan Ratio: <input type="text" name="PJ_ScanRatio" size="4" value="1.0"><p>
-Number of Rays<br>(samples) per detector: <input type="text" name="PJ_NRay" size="2" value="
3
"><p>
+Number of Rays<br>(samples) per detector: <input type="text" name="PJ_NRay" size="2" value="
2
"><p>
Rotation Angle<br>as a fraction of a cricle: <input type="text" name="PJ_RotAngle" size="3" value="1.0"><br>
</td></font>
<td valign="top">
Rotation Angle<br>as a fraction of a cricle: <input type="text" name="PJ_RotAngle" size="3" value="1.0"><br>
</td></font>
<td valign="top">
diff --git
a/libctsim/scanner.cpp
b/libctsim/scanner.cpp
index 88f99f00a87eaad8b19fafbaeccfc9c9b76e7d97..0319912339cbee2c8755852cc0bcdbbca561aee5 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (c) 1983-2001 Kevin Rosenberg
**
-** $Id: scanner.cpp,v 1.3
7 2001/03/18 18:08:25
kevin Exp $
+** $Id: scanner.cpp,v 1.3
8 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
**
** 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 (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[d] = 0;
+ detval[ detArray.nDet() / 2 ] = 1;
} else {
for (int d = 0; d < detArray.nDet(); d++) {
double xs = xs_maj;
} else {
for (int d = 0; d < detArray.nDet(); d++) {
double xs = xs_maj;
diff --git
a/tools/phm2if.cpp
b/tools/phm2if.cpp
index c6755eca9f6915276c9d0589b0f67926d1465e83..653e63528c9137f673e6cf2086776626de0d4d45 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: phm2if.cpp,v 1.2
3 2001/02/08 21:49:3
2 kevin Exp $
+** $Id: phm2if.cpp,v 1.2
4 2001/04/02 03:49:5
2 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
**
** 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}
};
{0, 0, 0, 0}
};
-static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.2
3 2001/02/08 21:49:3
2 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.2
4 2001/04/02 03:49:5
2 kevin Exp $";
void
phm2if_usage (const char *program)
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 << " --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 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";
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 0d71d4dfdf5225457bd7c9113a913c71dc734429..cfae91f808def5a62cfa00426a742a288488a5b3 100644
(file)
--- 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
**
** 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
**
** 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}
};
{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
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 << " 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 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";
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";