lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed HTML errors

Browse Source 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@8464 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
This commit is contained in:
rivers
2009-02-16 18:00:08 +00:00
parent 68b5226dfe
commit 3949917403
13 changed files with 90 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/MarCCDDoc.html
+5 -2
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector MarCCD driver</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">
@@ -652,7 +655,7 @@ marCCDConfig(const char *portName, const char *marCCDPort,
<p>
The following is an example st.cmd startup script:
</p>
<pre>< envPaths
<pre>&lt; envPaths
errlogInit(20000)
dbLoadDatabase("$(AREA_DETECTOR)/dbd/marCCDApp.dbd")
documentation/NDPluginColorConvert.html
+5 -2
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector Plugin NDPluginColorConvert</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">
@@ -44,7 +47,7 @@ public:
const char **pptypeName, size_t *psize);
/* These methods are just for this class */
template &lt typename epicstype &gt void convertColor(NDArray *pArray);
template &lt;typename epicstype&gt; void convertColor(NDArray *pArray);
};
...
}
documentation/NDPluginFile.html
+5 -2
View File
@@ -1,6 +1,9 @@
a<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector Plugin NDPluginFile</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">
@@ -189,7 +192,7 @@ variables:
</p>
<ul>
<li>dimensions: numArrays is the number of arrays in the file. It will be 1 for files
collected in Single mode, and is normally &gt 1 for files collected in Capture or
collected in Single mode, and is normally &gt;1 for files collected in Capture or
Stream mode. For each array dim0 is the slowest varying dimension, dim1 the next
slowest, etc.</li>
<li>variables: There are 3 variables in the netCDF file. uniqueId is the unique ID
documentation/NDPluginROI.html
+10 -8
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector Plugin NDPluginROI</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">
@@ -17,7 +20,6 @@
Contents</h2>
<ul>
<li><a href="#Overview">Overview</a></li>
<li><a href="#Configuration">Configuration</a></li>
<li><a href="#Screens">Screen shots</a></li>
</ul>
<h2 id="Overview">
@@ -82,7 +84,7 @@ public:
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>Parameter Definitions in NDPluginROI.h and EPICS Record Definitions in NDROI.template</b></td>
</tr>
<tr>
@@ -129,14 +131,14 @@ public:
<p>
NDPluginROI.h defines the following parameters that are specific to each individual
ROI in the plugin. The EPICS database NDROIN.template provide access to these parameters,
listed in the following table. The pasynUser-&gtaddr is used to control which ROI
listed in the following table. The pasynUser-&gt;addr is used to control which ROI
is being addressed. Note that to reduce the width of this table the enum names have
been split into 2 lines, but these are just a single name, for example <code>NDPluginROIName</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>Parameter Definitions in NDPluginROI.h and EPICS Record Definitions in NDROIN.template</b></td>
</tr>
<tr>
@@ -195,7 +197,7 @@ public:
bi</td>
</tr>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>ROI definition</b></td>
</tr>
<tr>
@@ -573,7 +575,7 @@ public:
longin</td>
</tr>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>ROI statistics</b></td>
</tr>
<tr>
@@ -685,7 +687,7 @@ public:
ai</td>
</tr>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>ROI histogram</b></td>
</tr>
<tr>
documentation/NDPluginStdArrays.html
+4 -1
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector Plugin NDPluginStdArrays</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">
documentation/RoperDoc.html
+5 -2
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector Roper driver</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">
@@ -385,7 +388,7 @@ roperConfig(const char *portName, int maxBuffers, size_t maxMemory);
<p>
The following is an example st.cmd startup script:
</p>
<pre>< envPaths
<pre>&lt; envPaths
errlogInit(20000)
dbLoadDatabase("$(AREA_DETECTOR)/dbd/roperApp.dbd")
documentation/adscDoc.html
+3 -3
View File
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector ADSC driver</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
documentation/areaDetector.html
+4 -1
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector: EPICS software for area detectors</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<h1>
documentation/areaDetectorReleaseNotes.html
+5 -2
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetectorReleaseNotes.html</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<h1 style="text-align: center">
@@ -98,7 +101,7 @@
<ul>
<li>Renamed the pasynUser member to pasynUserSelf. This avoids a name conflict with
the local variable pasynUser used in many derived classes. Unfortunately this requires
changes to derived class code where this-&gtpasynUser was used.</li>
changes to derived class code where this-&gt;pasynUser was used.</li>
</ul>
</li>
<li>Added simulation code to ADSC driver. This allows it to be built and tested on
documentation/pilatusDoc.html
+21 -19
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector Pilatus driver</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">
@@ -19,11 +22,10 @@
<li><a href="#Introduction">Introduction</a></li>
<li><a href="#StandardNotes">Implementation of standard driver parameters</a></li>
<li><a href="#Driver_parameters">Pilatus specific parameters</a></li>
<li><a href="#Unsupported">Unsupported standard driver parameters</a></li>
<li><a href="#Screenshots">Screenshots</a></li>
<li><a href="#Configuring">Configuring</a></li>
<li><a href="#Performance measurements">Performance measurements</a> </li>
<li><a href="#Hardware notes">Hardware notes</a> </li>
<li><a href="#MEDM_screens">MEDM screens</a></li>
<li><a href="#Configuration">Configuration</a></li>
<li><a href="#Performance_measurements">Performance measurements</a> </li>
<li><a href="#Hardware_notes">Hardware notes</a> </li>
<li><a href="#Restrictions">Restrictions</a> </li>
</ul>
<h2 id="Introduction" style="text-align: left">
@@ -116,7 +118,7 @@
$(P$(R)ExposurePeriod</td>
<td>
Controls the exposure period in seconds. It applies only in Internal or External
Trigger modes when NumImages &gt 1.</td>
Trigger modes when NumImages &gt;1.</td>
</tr>
<tr>
<td>
@@ -134,7 +136,7 @@
<td>
Controls the acquisition. Setting this to 1 starts image acquisition. The driver
sets the record to 0 when acquisition is complete. This means an entire acquisition
series if NImages &gt 1. Setting this to 0 aborts an acquisition. If the driver
series if NImages &gt;1. Setting this to 0 aborts an acquisition. If the driver
was currently acquiring imges then this record will cause the "Stop" and "K" (Kill)
commands to be sent to camserver.</td>
</tr>
@@ -384,10 +386,10 @@ badX2,badY2 replacementX2,replacementY2
for spatial non-uniformity in the response of the detector. It should be collected
with a spatially uniform intensity on the detector at roughly the same energy as
the measurements being corrected. When the flat field file is read, the average
pixel value (averageFlatField) is computed using all pixels with intensities &gt
PilatusMinFlatField. All pixels with intensity &lt PilatusMinFlatField in the flat
field are replaced with averageFlatField. When images are collected before the NDArray
callbacks are performed the following per-pixel correction is applied:
pixel value (averageFlatField) is computed using all pixels with intensities &gt;PilatusMinFlatField.
All pixels with intensity &lt;PilatusMinFlatField in the flat field are replaced
with averageFlatField. When images are collected before the NDArray callbacks are
performed the following per-pixel correction is applied:
<pre>ImageData[i] =
(averageFlatField *
ImageData[i])/flatField[i];
@@ -527,7 +529,7 @@ pilatusDetectorConfig(const char *portName, const char *camserverPort,
<p>
The following is an example st.cmd startup script:
</p>
<pre>< envPaths
<pre>&lt; envPaths
errlogInit(20000)
dbLoadDatabase("$(AREA_DETECTOR)/dbd/pilatusDetectorApp.dbd")
@@ -608,7 +610,7 @@ iocInit()
create_monitor_set("auto_settings.req", 30,"P=13PIL1:,D=cam1:")
</pre>
<h2 id="MEDM screens" style="text-align: left">
<h2 id="MEDM_screens" style="text-align: left">
MEDM screens</h2>
<p>
The following show the MEDM screens that are used to control the Pilatus debtector.
@@ -681,7 +683,7 @@ create_monitor_set("auto_settings.req", 30,"P=13PIL1:,D=cam1:")
<h3>
asynOctet.adl</h3>
<img alt="pilatusAsynOctet.png" src="pilatusAsynOctet.png" /></div>
<h2 id="SPEC interface" style="text-align: left">
<h2 id="SPEC_interface" style="text-align: left">
SPEC interface</h2>
<p>
At the GSECARS beamlines (13-ID-C and 13-BM-C) at the APS we use SPEC to control
@@ -799,7 +801,7 @@ def epics_pilatus_count '{
#p "image collection done"
}
if( (sc_done==TRUE) && (img_done==TRUE)) break;
if( (sc_done==TRUE) &amp;&amp; (img_done==TRUE)) break;
sleep(0.01)
}
@@ -819,7 +821,7 @@ def user_getcounts '{
S[iroi] = epics_get(PILATUS_ROI_PV)
</pre>
<h2 id="Performance measurements">
<h2 id="Performance_measurements">
Performance measurements</h2>
<p>
The following measurements were done to demonstrate the performance that can be
@@ -880,8 +882,8 @@ def user_getcounts '{
single-exposure mode. The trajectory scanning mode is thus more than 50 times faster
to execute the identical SPEC scan.</li>
</ol>
<h2 id="Hardware notes" style="text-align: left">
</h2>
<h2 id="Hardware_notes">
Hardware notes</h2>
<h3>
Trigger pulses</h3>
<p>
documentation/pluginDoc.html
+10 -7
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector Plugins</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">
@@ -61,7 +64,7 @@
be saving the entire detector), and plugged into a particular ROI, where it would
just save a portion of the detector. Similarly the NDPluginColorConvert plugin is
also a source of NDArray data callbacks. A pipeline of plugins can be constructed,
for example NDPluginColorConvert -&gt NDPluginROI -&gt NDPluginStdArrays. Each stage
for example NDPluginColorConvert-&gt;NDPluginROI-&gt;NDPluginStdArrays. Each stage
of this pipeline can be executing in its own thread, and on modern multi-core processors
each can be executing on its own core.</li>
</ul>
@@ -134,7 +137,7 @@ public:
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>Parameter Definitions in NDPluginDriver.h and EPICS Record Definitions in NDPluginBase.template</b></td>
</tr>
<tr>
@@ -154,7 +157,7 @@ public:
EPICS record type</th>
</tr>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>asyn NDArray driver doing callbacks</b></td>
</tr>
<tr>
@@ -199,7 +202,7 @@ public:
longin</td>
</tr>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>Callback enable, minimum time, and statistics</b></td>
</tr>
<tr>
@@ -322,7 +325,7 @@ public:
longin</td>
</tr>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>Information about last NDArray callback data</b></td>
</tr>
<tr>
@@ -477,7 +480,7 @@ public:
ai</td>
</tr>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>Debugging control</b></td>
</tr>
<tr>
documentation/prosilicaDoc.html
+9 -9
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector Prosilica driver</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">
@@ -17,13 +20,10 @@
Contents</h2>
<ul>
<li><a href="#Overview">Overview</a></li>
<li><a href="#Performance measurements">Performance measurements</a></li>
<li><a href="#Hardware notes">Hardware notes</a></li>
<li><a href="#Restrictions">Restrictions</a></li>
<li><a href="#Future">Future enhancements</a></li>
</ul>
<h2 id="Prosilica Driver">
Prosilica Driver</h2>
<h2 id="Overview">
Overview</h2>
<p>
This is a driver for Gigabit Ethernet and Firewire cameras from <a href="http://www.prosilica.com">
Prosilica</a>. It inherits from ADDriver and implements nearly all of the parameters
@@ -91,7 +91,7 @@
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>Parameter Definitions in prosilica.cpp and EPICS Record Definitions in prosilica.template</b></td>
</tr>
<tr>
@@ -111,7 +111,7 @@
EPICS record type</th>
</tr>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>Trigger and I/O Control</b></td>
</tr>
<tr>
@@ -458,7 +458,7 @@
ai</td>
</tr>
<tr>
<td align="CENTER" colspan="7,">
<td align="center" colspan="7,">
<b>Statistics Information</b></td>
</tr>
<tr>
documentation/simDetectorDoc.html
+4 -1
View File
@@ -1,6 +1,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>areaDetector Simulation driver</title>
<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
</head>
<body>
<div style="text-align: center">