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
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";
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";
sub FilterMetaChars
{
my $var = pop(@_);
- $var =~ /^(\w+)$/;
+ $var =~ /^([-\w]+)$/;
$1;
}
<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>
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">
** 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
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;
** 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
{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)
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";
** 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
{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
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";