diff --git a/documentation/areaDetector.html b/documentation/areaDetector.html
index 11388a1..211dfcd 100755
--- a/documentation/areaDetector.html
+++ b/documentation/areaDetector.html
@@ -88,7 +88,7 @@
1-3 |
- 15-Nov-2008 |
+ 24-Nov-2008
areaDetectorR1-3.tgz |
diff --git a/documentation/areaDetectorReleaseNotes.html b/documentation/areaDetectorReleaseNotes.html
index 1e35155..d42f85d 100755
--- a/documentation/areaDetectorReleaseNotes.html
+++ b/documentation/areaDetectorReleaseNotes.html
@@ -6,7 +6,7 @@
areaDetector Release Notes
- Release 1-3 (15-November-2008)
+ Release 1-3 (24-November-2008)
- 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 @@
- Reorganized the file I/O parameters, template files and medm screens
- - 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.
+ - 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.
- 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.
- - Removed the file I/O PVs from ADBase.adl. Added a related display link
- to NDFile.adl.
+ 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.
+ - Removed the file I/O PVs from ADBase.adl. Added a related display link to NDFile.adl.
- 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.
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.
+ Added variant of NDPluginDriver::createFileName that returns the filePath and
+ fileName separately, rather than a complete file name including the path.
Release 1-2 (24-October-2008)
diff --git a/documentation/pluginDoc.html b/documentation/pluginDoc.html
index d3da193..3cc9da0 100755
--- a/documentation/pluginDoc.html
+++ b/documentation/pluginDoc.html
@@ -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);
+
...
}
@@ -113,15 +115,16 @@ public:
and then they perform whatever operations are specific to that plugin.
createFileName This is a convenience function that constructs a complete
file name in the ADFullFileName parameter from the ADFilePath, ADFileName, ADFileNumber,
- and ADFileTemplate parameters.
+ 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.
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 NDPluginDriverArrayPort.
+ 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 NDPluginDriverArrayPort.
@@ -151,7 +154,8 @@ public:
- NDPluginDriver ArrayPort |
+ NDPluginDriver
+ ArrayPort
asynOctet |
@@ -170,7 +174,8 @@ public:
|
- NDPluginDriver ArrayAddr |
+ NDPluginDriver
+ ArrayAddr
asynInt32 |
@@ -194,7 +199,8 @@ public:
|
- NDPluginDriver EnableCallbacks |
+ NDPluginDriver
+ EnableCallbacks
asynInt32 |
@@ -213,7 +219,8 @@ public:
|
- NDPluginDriver BlockingCallbacks |
+ NDPluginDriver
+ BlockingCallbacks
asynInt32 |
@@ -235,7 +242,8 @@ public:
|
- NDPluginDriver MinCallbackTime |
+ NDPluginDriver
+ MinCallbackTime
asynFloat64 |
@@ -255,7 +263,8 @@ public:
|
- NDPluginDriver ArrayCounter |
+ NDPluginDriver
+ ArrayCounter
asynInt32 |
@@ -289,7 +298,8 @@ public:
|
- NDPluginDriver DroppedArrays |
+ NDPluginDriver
+ DroppedArrays
asynInt32 |
@@ -312,7 +322,8 @@ public:
|
- NDPluginDriver NDimensions |
+ NDPluginDriver
+ NDimensions
asynInt32 |
@@ -328,7 +339,8 @@ public:
|
- NDPluginDriver Dimensions |
+ NDPluginDriver
+ Dimensions
asynInt32Array |
@@ -376,7 +388,8 @@ public:
|
- NDPluginDriver DataType |
+ NDPluginDriver
+ DataType
asynInt32 |
@@ -392,7 +405,8 @@ public:
|
- NDPluginDriver UniqueId |
+ NDPluginDriver
+ UniqueId
asynInt32 |
@@ -408,7 +422,8 @@ public:
|
- NDPluginDriver TimeStamp |
+ NDPluginDriver
+ TimeStamp
asynFloat64 |
| |