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

Minor fixes

Browse Source 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@10305 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
This commit is contained in:
rivers
2010-03-22 18:45:39 +00:00
parent 1c0ed0a100
commit 5ba5589ea2
16 changed files with 136 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
documentation/FirewireWinDoc.html
View File

@@ -559,8 +559,8 @@
<p>
The firewireWinDCAM driver implements the following parameters in addition to those
in asynNDArrayDriver.h and ADDriver.hh. 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>mar345ScanSize</code>.
the parameter index variable names have been split into 2 lines, but these are just
a single name, for example <code>mar345ScanSize</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -570,7 +570,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -578,7 +578,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

31
documentation/Mar345Doc.html
View File

@@ -75,7 +75,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
EPICS record name</th>
<th>
@@ -141,15 +141,17 @@
<td>
$(P$(R)FileTemplate</td>
<td>
The mar345dtb program uses a file extension which describes the scan size and resolution, e.g. 3450, etc.
Thus the FileTemplate should not include an extension. Furthermore mar345dtb always uses exactly 3 digits for
the FileNumber (with leading zeros if required), just before the extension.
Thus the final 3 characters of the FileTemplate must be "%3.3d". If they are not then mar345dtb will
successfully save the file, but with a different name than the areaDetector driver was expecting it to use,
and the driver will generate an error when it tries to open the file to read the data. A good value for
FileTemplate is thus "%s%s_3.3d", which will concatentate the FilePath and FileName, followed by an underscore
and then a 3 digit number with leading zeros if required. The underscore is optional, and other characters
can be placed between the FileName and the FileNumber if desired.</td>
The mar345dtb program uses a file extension which describes the scan size and resolution,
e.g. 3450, etc. Thus the FileTemplate should not include an extension. Furthermore
mar345dtb always uses exactly 3 digits for the FileNumber (with leading zeros if
required), just before the extension. Thus the final 3 characters of the FileTemplate
must be "%3.3d". If they are not then mar345dtb will successfully save the file,
but with a different name than the areaDetector driver was expecting it to use,
and the driver will generate an error when it tries to open the file to read the
data. A good value for FileTemplate is thus "%s%s_3.3d", which will concatentate
the FilePath and FileName, followed by an underscore and then a 3 digit number with
leading zeros if required. The underscore is optional, and other characters can
be placed between the FileName and the FileNumber if desired.</td>
</tr>
<tr>
<td>
@@ -181,8 +183,9 @@
mar345 specific parameters</h2>
<p>
The mar345 driver implements the following parameters in addition to those in asynNDArrayDriver.h
and ADDriver.h. 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>mar345ScanSize</code>.
and ADDriver.h. Note that to reduce the width of this table the parameter index
variable names have been split into 2 lines, but these are just a single name, for
example <code>mar345ScanSize</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -192,7 +195,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -200,7 +203,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

11
documentation/MarCCDDoc.html
View File

@@ -88,7 +88,7 @@ remote_mode_server_arguments 2222
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
EPICS record name</th>
<th>
@@ -174,8 +174,9 @@ remote_mode_server_arguments 2222
MarCCD specific parameters</h2>
<p>
The MarCCD driver implements the following parameters in addition to those in asynNDArrayDriver.h
and ADDriver.h. 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>marCCDState</code>.
and ADDriver.h. Note that to reduce the width of this table the parameter index
variable names have been split into 2 lines, but these are just a single name, for
example <code>marCCDState</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -185,7 +186,7 @@ remote_mode_server_arguments 2222
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -193,7 +194,7 @@ remote_mode_server_arguments 2222
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

4
documentation/NDPluginColorConvert.html
View File

@@ -50,7 +50,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -58,7 +58,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

16
documentation/NDPluginFile.html
View File

@@ -346,7 +346,7 @@ variables:
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -354,7 +354,7 @@ variables:
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>
@@ -406,11 +406,13 @@ variables:
There is currently no documentation on the contents of the XML template file. However,
there are example XML template files in the iocSimDetector and iocPerkinElmer directories.
Documentation on the XML file contents will be written ASAP.</p>
<p>The prebuilt Linux libraries libhdf5. and libNeXus.a are built with HDF5 1.6.9. When they are
built with the latest version, 1.8.2, they require GLIBC version 2.7 or higher, i.e. /lib/libc-2.7.so or
higher. Since users may want to install areaDetector on older Linux systems (which predate Fedora Core 8 for
example), it was decided to use this older version of HDF5. Future releases of areaDetector may use HDF5 1.8.2
or later, and hence not work with older Linux systems.</p>
<p>
The prebuilt Linux libraries libhdf5. and libNeXus.a are built with HDF5 1.6.9.
When they are built with the latest version, 1.8.2, they require GLIBC version 2.7
or higher, i.e. /lib/libc-2.7.so or higher. Since users may want to install areaDetector
on older Linux systems (which predate Fedora Core 8 for example), it was decided
to use this older version of HDF5. Future releases of areaDetector may use HDF5
1.8.2 or later, and hence not work with older Linux systems.</p>
<h2 id="Screens">
Screen shots</h2>
<p>

14
documentation/NDPluginProcess.html
View File

@@ -66,9 +66,9 @@
NDPluginProcess.h defines the following parameters. It also implements all of the
standard plugin parameters from <a href="pluginDoc.html#NDPluginDriver">NDPluginDriver</a>.
The EPICS database NDProcess.template provide access to these parameters, listed
in the following table. 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>
NDPluginProcessSaveBackground</code>.
in the following table. Note that to reduce the width of this table the parameter
index variable names have been split into 2 lines, but these are just a single name,
for example <code>NDPluginProcessSaveBackground</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -86,7 +86,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>
@@ -977,9 +977,9 @@ NDProcessConfigure(const char *portName, int queueSize, int blockingCallbacks,
Screen shots</h2>
<p>
The following is the MEDM screen that provides access to the parameters in NDPluginDriver.h
and NDPluginProcess.h through records in NDPluginBase.template and NDProcess.template. In this
example the input image is first scaled by 35 and offset by -110. The image is then run through
a recursive averaging filter with N=100.
and NDPluginProcess.h through records in NDPluginBase.template and NDProcess.template.
In this example the input image is first scaled by 35 and offset by -110. The image
is then run through a recursive averaging filter with N=100.
</p>
<div style="text-align: center">
<h3>

8
documentation/NDPluginROI.html
View File

@@ -64,9 +64,9 @@
NDPluginROI.h defines the following parameters. It also implements all of the standard
plugin parameters from <a href="pluginDoc.html#NDPluginDriver">NDPluginDriver</a>.
The EPICS database NDROI.template provide access to these parameters, listed in
the following table. 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>.
the following table. Note that to reduce the width of this table the parameter index
variable 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>
@@ -84,7 +84,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

8
documentation/NDPluginStats.html
View File

@@ -40,9 +40,9 @@
NDPluginStats.h defines the following parameters. It also implements all of the
standard plugin parameters from <a href="pluginDoc.html#NDPluginDriver">NDPluginDriver</a>.
The EPICS database NDStats.template provide access to these parameters, listed in
the following table. 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>
NDPluginStatsComputeStatistics</code>.
the following table. Note that to reduce the width of this table the parameter index
variable names have been split into 2 lines, but these are just a single name, for
example <code>NDPluginStatsComputeStatistics</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -60,7 +60,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

4
documentation/NDPluginStdArrays.html
View File

@@ -54,7 +54,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -62,7 +62,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

79
documentation/PerkinElmerDoc.html
View File

@@ -34,15 +34,15 @@
This is a driver for the flat-panel amorphous silicon detectors from <a href="http://optoelectronics.perkinelmer.com/catalog/Category.aspx?CategoryName=X-Ray+Cameras">
PerkinElmer</a>.</p>
<p>
The driver is based upon the XISL library provided by PerkinElmer. It only runs on Microsoft
Windows computers.
The driver is based upon the XISL library provided by PerkinElmer. It only runs
on Microsoft Windows computers.
</p>
<p>
This driver has been tested with the following detectors</p>
<ul>
<li>XRD0820 w/ XRD-FG PCI frame grabber</li>
<li>XRD1621 w/ XRD-FGX PCI frame grabber</li>
</ul>
<ul>
<li>XRD0820 w/ XRD-FG PCI frame grabber</li>
<li>XRD1621 w/ XRD-FGX PCI frame grabber</li>
</ul>
<p>
ADD ADDTIONAL INTRODUCTORY TEXT HERE.</p>
<p>
@@ -69,7 +69,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
EPICS record name</th>
<th>
@@ -87,21 +87,21 @@
<td>
ADAcquireTime</td>
<td>
$(P)$(R)AcquireTime<br/>
$(P)$(R)AcquireTime<br />
$(P)$(R)AcquireTime_RBV</td>
<td>
When using Internal Triggers, this parameter controls the period between trigger pulses
which will also be equal to the exposure time. This parameter is only updated when the
detector is initialized</td>
When using Internal Triggers, this parameter controls the period between trigger
pulses which will also be equal to the exposure time. This parameter is only updated
when the detector is initialized</td>
</tr>
<tr>
<td>
ADTriggerMode</td>
<td>
$(P)$(R)TriggerMode<br/>
$(P)$(R)TriggerMode<br />
$(P)$(R)TriggerMode_RBV</td>
<td>
Sets the trigger mode for the detector. Options are:
Sets the trigger mode for the detector. Options are:
<ul>
<li>Internal</li>
<li>External</li>
@@ -122,8 +122,8 @@
<p>
The PerkinElmer driver implements the following parameters in addition to those
in asynNDArrayDriver.h and ADDriver.h. 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>PerkinElmerXXX</code>.
the parameter index variable names have been split into 2 lines, but these are just
a single name, for example <code>PerkinElmerXXX</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -133,7 +133,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -141,7 +141,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>
@@ -159,10 +159,10 @@
<td>
PE_NUM_FRAME_BUFFERS</td>
<td>
$(P)$(R)PENumFrameBuffers<br/>
$(P)$(R)PENumFrameBuffers<br />
$(P)$(R)PENumFrameBuffers_RBV</td>
<td>
longout<br/>
longout<br />
longin</td>
</tr>
<tr>
@@ -189,7 +189,7 @@
<td>
r/w</td>
<td>
Status of PerkinElmer driver. Need to integrate this into DetectorState</td>
Status of PerkinElmer driver. Need to integrate this into DetectorState</td>
<td>
PE_STATUS</td>
<td>
@@ -261,7 +261,10 @@
<td>
longout</td>
</tr>
<tr><td align="center" colspan="7"><b>Offset corrections</b></td></tr>
<tr>
<td align="center" colspan="7">
<b>Offset corrections</b></td>
</tr>
<tr>
<td>
PE_NumOffsetFrames</td>
@@ -326,7 +329,10 @@
<td>
mbbi</td>
</tr>
<tr><td align="center" colspan="7"><b>Gain corrections</b></td></tr>
<tr>
<td align="center" colspan="7">
<b>Gain corrections</b></td>
</tr>
<tr>
<td>
PE_NumGainFrames</td>
@@ -391,7 +397,10 @@
<td>
mbbi</td>
</tr>
<tr><td align="center" colspan="7"><b>Bad pixel corrections</b></td></tr>
<tr>
<td align="center" colspan="7">
<b>Bad pixel corrections</b></td>
</tr>
<tr>
<td>
PE_UsePixelCorrections</td>
@@ -424,13 +433,11 @@
<td>
mbbi</td>
</tr>
<tr>
<td>
PE_BadPixelFile
PE_BadPixelFile_RBV</td>
PE_BadPixelFile PE_BadPixelFile_RBV</td>
<td>
asynOctetWrite<br/>
asynOctetWrite<br />
aynnOctetRead</td>
<td>
w</td>
@@ -439,12 +446,15 @@
<td>
PE_BAD_PIXEL_FILE</td>
<td>
$(P)$(R)PEBadPixelFile<br/>
$(P)$(R)PEBadPixelFile<br />
$(P)$(R)PEBadPixelFile_RBV</td>
<td>
waveform</td>
</tr>
<tr><td align="center" colspan="7"><b>Load/Save offset/gain corrections</b></td></tr>
<tr>
<td align="center" colspan="7">
<b>Load/Save offset/gain corrections</b></td>
</tr>
<tr>
<td>
PE_CorrectionsDirectory</td>
@@ -501,12 +511,11 @@
The PerkinElmer driver does not support the following standard driver parameters
because they are not supported in the PerkinElmer library:</p>
<ul>
<li> Size (ADBinX, ADBinY, ADMinX, ADMinY, ADSizeX, ADSizeY)</li>
<li> Type/Color (NDDataType, NDColorMode)</li>
<li> File ( None of the file parameters in NDFile )</li>
<li> Binning (Not supported in software yet ) </li>
<li> No Hardware shutter control </li>
<li>Size (ADBinX, ADBinY, ADMinX, ADMinY, ADSizeX, ADSizeY)</li>
<li>Type/Color (NDDataType, NDColorMode)</li>
<li>File ( None of the file parameters in NDFile )</li>
<li>Binning (Not supported in software yet ) </li>
<li>No Hardware shutter control </li>
<li>List any unsupported parameters here (WORK NEEDED)</li>
</ul>
<h2 id="Configuration">

11
documentation/RoperDoc.html
View File

@@ -91,7 +91,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
EPICS record name</th>
<th>
@@ -200,8 +200,9 @@
Roper specific parameters</h2>
<p>
The Roper driver implements the following parameters in addition to those in asynNDArrayDriver.h
and ADDriver.h. 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>marCCDState</code>.
and ADDriver.h. Note that to reduce the width of this table the parameter index
variable names have been split into 2 lines, but these are just a single name, for
example <code>marCCDState</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -211,7 +212,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -219,7 +220,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

11
documentation/pilatusDoc.html
View File

@@ -66,7 +66,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
EPICS record name</th>
<th>
@@ -194,8 +194,9 @@ test6_2_0035.tif test6_2_0035.tif, test6_2_0036.tif, ...
Pilatus specific parameters</h2>
<p>
The Pilatus driver implements the following parameters in addition to those in asynNDArrayDriver.h
and ADDriver.h:. 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>PilatusDelayTime</code>.
and ADDriver.h:. Note that to reduce the width of this table the parameter index
variable names have been split into 2 lines, but these are just a single name, for
example <code>PilatusDelayTime</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -205,7 +206,7 @@ test6_2_0035.tif test6_2_0035.tif, test6_2_0036.tif, ...
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -213,7 +214,7 @@ test6_2_0035.tif test6_2_0035.tif, test6_2_0036.tif, ...
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

4
documentation/prosilicaDoc.html
View File

@@ -110,7 +110,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -118,7 +118,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

11
documentation/pvcamDoc.html
View File

@@ -68,7 +68,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
EPICS record name</th>
<th>
@@ -88,8 +88,9 @@
PVCAM specific parameters</h2>
<p>
The PVCAM driver implements the following parameters in addition to those in asynNDArrayDriver.h
and ADDriver.h. 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>PVCamInitDetector</code>.
and ADDriver.h. Note that to reduce the width of this table the parameter index
variable names have been split into 2 lines, but these are just a single name, for
example <code>PVCamInitDetector</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -99,7 +100,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -107,7 +108,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

4
documentation/simDetectorDoc.html
View File

@@ -62,7 +62,7 @@
</tr>
<tr>
<th>
Enum name</th>
Parameter index variable</th>
<th>
asyn interface</th>
<th>
@@ -70,7 +70,7 @@
<th>
Description</th>
<th>
drvUser string</th>
drvInfo string</th>
<th>
EPICS record name</th>
<th>

20
documentation/todo.txt
View File

@@ -1,9 +1,23 @@
R1-6
Firewire (Windows) driver
Firewire (Windows) driver:
- Not working correctly for AcquireTime initially - absolute/device mode
problem
Prosilica driver:
- Switching 8/16 bits does not work until size or some other PV is processed.
- ROI plugin not doing correct thing for some color modes. Test with
simDetector plugin in all modes.
- Test transform plugin, make medm screen compatible and write documentation
- Add cross-sections to Stats plugin?
- Change startup scripts, auto_settings.req, ADTop.adl and medm screens for
every detector
- Fix bug in ImageJ viewer when no arrays available, or when IOC rebooted
Longer term:
@@ -27,10 +41,6 @@ Longer term:
File plugins
- Implement reading
drvNDROI
- Add cross-sections?
- Add scaling and offset, useful when converting data types?
Prosilica driver
- Connection management