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

Minor changes for R1-3

Browse Source 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@7896 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
This commit is contained in:
rivers
2008-11-24 19:09:25 +00:00
parent 9efafdbd65
commit a69662bf7e
3 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/areaDetector.html
+1 -1
View File
@@ -88,7 +88,7 @@
<td>
1-3</td>
<td>
15-Nov-2008</td>
24-Nov-2008</td>
<td>
<a href="http://cars.uchicago.edu/software/pub/areaDetectorR1-3.tgz">areaDetectorR1-3.tgz</a></td>
<td>
documentation/areaDetectorReleaseNotes.html
+14 -15
View File
@@ -6,7 +6,7 @@
<h1 style="text-align: center">
areaDetector Release Notes</h1>
<h2 style="text-align: center">
Release 1-3 (15-November-2008)</h2>
Release 1-3 (24-November-2008)</h2>
<ul>
<li>Added a driver for MarCCD detectors. Compared to the previous support in the "ccd"
module, this driver uses the faster Version 1 protocol for the Mar server. It also
@@ -24,22 +24,19 @@
</li>
<li>Reorganized the file I/O parameters, template files and medm screens
<ul>
<li>Moved the file capture parameters from NDPluginFile.h and NDPluginFile.cpp
to ADStdDriverParams.h. This allows a detector driver to use these capture
parameters if desired.</li>
<li>Moved the file capture parameters from NDPluginFile.h and NDPluginFile.cpp to
ADStdDriverParams.h. This allows a detector driver to use these capture parameters
if desired.</li>
<li>Removed all of the file I/O records from ADBase.template and ADBase_settings.req.
These previously duplicated the records in NDFile.template and NDFile_settings.req,
which was hard to maintain.
IOCs for detector drivers that can do file I/O now need to load NDFile.template,
while those that cannot no longer need to load these records.
They also need to have NDFile_settings.req added to auto_settings.req.
This does not effect the file plugin support, only drivers that directly
do file I/O.</li>
<li>Removed the file I/O PVs from ADBase.adl. Added a related display link
to NDFile.adl.</li>
These previously duplicated the records in NDFile.template and NDFile_settings.req,
which was hard to maintain. IOCs for detector drivers that can do file I/O now need
to load NDFile.template, while those that cannot no longer need to load these records.
They also need to have NDFile_settings.req added to auto_settings.req. This does
not effect the file plugin support, only drivers that directly do file I/O.</li>
<li>Removed the file I/O PVs from ADBase.adl. Added a related display link to NDFile.adl.</li>
<li>NDFile.adl now contains only the file related PVs, not the plugin related PVs.
The new file NDPluginFile.adl replaces the previous version of NDFile.adl,
and contains both the file PVs and the plugin PVs.
The new file NDPluginFile.adl replaces the previous version of NDFile.adl, and contains
both the file PVs and the plugin PVs.</li>
</ul>
</li>
<li>Added new enums in ADStdDriverParams.h
@@ -70,6 +67,8 @@
MarCCD and Pilatus detectors setting this to 0 will disable reading the disk files
after collection. This can be used to reduce overhead when EPICS is being used just
for control, rather than to access the data. </li>
<li>Added variant of NDPluginDriver::createFileName that returns the filePath and
fileName separately, rather than a complete file name including the path.</li>
</ul>
<h2 style="text-align: center">
Release 1-2 (24-October-2008)</h2>
documentation/pluginDoc.html
+32 -17
View File
@@ -88,7 +88,9 @@ public:
/* These are the methods that are new to this class */
virtual void processCallbacks(NDArray *pArray);
int createFileName(int maxChars, char *fullFileName);
virtual int createFileName(int maxChars, char *fullFileName);
virtual int createFileName(int maxChars, char *filePath, char *fileName);
...
}
</pre>
@@ -113,15 +115,16 @@ public:
and then they perform whatever operations are specific to that plugin.</li>
<li><code>createFileName</code> This is a convenience function that constructs a complete
file name in the ADFullFileName parameter from the ADFilePath, ADFileName, ADFileNumber,
and ADFileTemplate parameters.</li>
and ADFileTemplate parameters. There are two variants: the first returns a complete
file name, including the path. The second returns the path and file name separately.</li>
</ul>
<p>
NDPluginDriver defines parameters that all plugin drivers should implement if possible.
These parameters are defined by enum values with an associated asyn interface, and
access (read-only or read-write). The EPICS database NDPluginBase.template provides
access to these standard plugin 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>NDPluginDriverArrayPort</code>.
access to these standard plugin 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>NDPluginDriverArrayPort</code>.
</p>
<table border="1" cellpadding="2" cellspacing="2" style="text-align: left">
<tbody>
@@ -151,7 +154,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>ArrayPort</td>
NDPluginDriver<br />
ArrayPort</td>
<td>
asynOctet</td>
<td>
@@ -170,7 +174,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>ArrayAddr</td>
NDPluginDriver<br />
ArrayAddr</td>
<td>
asynInt32</td>
<td>
@@ -194,7 +199,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>EnableCallbacks</td>
NDPluginDriver<br />
EnableCallbacks</td>
<td>
asynInt32</td>
<td>
@@ -213,7 +219,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>BlockingCallbacks</td>
NDPluginDriver<br />
BlockingCallbacks</td>
<td>
asynInt32</td>
<td>
@@ -235,7 +242,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>MinCallbackTime</td>
NDPluginDriver<br />
MinCallbackTime</td>
<td>
asynFloat64</td>
<td>
@@ -255,7 +263,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>ArrayCounter</td>
NDPluginDriver<br />
ArrayCounter</td>
<td>
asynInt32</td>
<td>
@@ -289,7 +298,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>DroppedArrays</td>
NDPluginDriver<br />
DroppedArrays</td>
<td>
asynInt32</td>
<td>
@@ -312,7 +322,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>NDimensions</td>
NDPluginDriver<br />
NDimensions</td>
<td>
asynInt32</td>
<td>
@@ -328,7 +339,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>Dimensions</td>
NDPluginDriver<br />
Dimensions</td>
<td>
asynInt32Array</td>
<td>
@@ -376,7 +388,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>DataType</td>
NDPluginDriver<br />
DataType</td>
<td>
asynInt32</td>
<td>
@@ -392,7 +405,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>UniqueId</td>
NDPluginDriver<br />
UniqueId</td>
<td>
asynInt32</td>
<td>
@@ -408,7 +422,8 @@ public:
</tr>
<tr>
<td>
NDPluginDriver<br/>TimeStamp</td>
NDPluginDriver<br />
TimeStamp</td>
<td>
asynFloat64</td>
<td>