diff --git a/documentation/PerkinElmerDoc.html b/documentation/PerkinElmerDoc.html
index a7de537..f3fddec 100644
--- a/documentation/PerkinElmerDoc.html
+++ b/documentation/PerkinElmerDoc.html
@@ -31,19 +31,20 @@
Introduction
- This is a driver for the flat-panel amorphous silicon detectors from
- PerkinElmer.
+ This is an EPICS
+ areaDetector driver for the flat-panel amorphous silicon detectors from
+ PerkinElmer.
The driver is based upon the XISL library provided by PerkinElmer. It only runs
- on Microsoft Windows computers. It supports both 32-bit and 64-bit versions of Windows.
+ on Microsoft Windows computers. It supports both 32-bit and 64-bit versions of Windows.
This driver has been tested with the following detectors
- XRD0820 w/ XRD-FG PCI frame grabber
- XRD1621 w/ XRD-FGX PCI frame grabber
- - XRD1621 w/ XRD-FGe Opto PCI-Express frame grabber
-
+ XRD1621 w/ XRD-FGe Opto PCI-Express frame grabber
+
This driver inherits from ADDriver.
It implements many of the parameters in
@@ -78,7 +79,8 @@
$(P)$(R)NumImages |
- Controls the number of images to acquire when ADImageMode is Multiple or Average |
+ Controls the number of images to acquire when ADImageMode is Multiple or Average
+
|
@@ -88,8 +90,7 @@
$(P)$(R)AcquireTime_RBV |
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. |
+ pulses which will also be equal to the exposure time.
@@ -102,30 +103,30 @@
- Internal
- External
- - Free Run
+ - Free Running
- Soft Trigger
|
-
- |
- ADImageMode |
-
- $(P)$(R)ImageMode
- $(P)$(R)ImageMode_RBV |
-
- Sets the trigger mode for the detector. Options are:
-
- - Single
- - Multiple
- - Continuous
- - Average. This mode is new for the Perkin Elmer. It averages NumImages frames in
- the hardware frame grabber. It is useful when the total acquisition time is longer than
- the 5 second maximum allowed in Internal trigger mode, etc.
-
- |
-
-
+
+ |
+ ADImageMode |
+
+ $(P)$(R)ImageMode
+ $(P)$(R)ImageMode_RBV |
+
+ Sets the trigger mode for the detector. Options are:
+
+ - Single
+ - Multiple
+ - Continuous
+ - Average. This mode is new for the Perkin Elmer. It averages NumImages frames in
+ the hardware frame grabber. It is useful when the total acquisition time is longer
+ than the 5 second maximum allowed in Internal trigger mode, etc.
+
+ |
+
+
PerkinElmer specific parameters
@@ -139,7 +140,8 @@
|
- Parameter Definitions in PerkinElmer.h and EPICS Record Definitions in PerkinElmer.template |
+ Parameter Definitions in PerkinElmer.h and EPICS Record Definitions in PerkinElmer.template
+
|
@@ -165,7 +167,7 @@
|
r/w |
- Number of frame buffers to use |
+ Number of software frame buffers to use
PE_NUM_FRAME_BUFFERS |
@@ -199,7 +201,7 @@
|
r/w |
- Status of PerkinElmer driver. Need to integrate this into DetectorState |
+ Status of PerkinElmer driver. SHOULD DELETE THIS AND JUST USE DETECTOR STATE.
PE_STATUS |
@@ -247,7 +249,8 @@
|
r |
- Frame number from the hardware frame buffer for this image. Values go from 1 to 8. |
+ Frame number from the hardware frame buffer for this image. Values go from 1 to
+ 8.
PE_FRAME_BUFFER_INDEX |
@@ -263,7 +266,7 @@
|
r |
- Image number for this image in the image buffer array. |
+ Image number for this image in the software frame buffer array.
PE_IMAGE_NUMBER |
@@ -283,7 +286,7 @@
|
r/w |
- Number of frames to collect and average when collecting offset image |
+ Number of frames to collect and average when collecting offset frames
PE_NUM_OFFSET_FRAMES |
@@ -291,21 +294,37 @@
|
longout |
+
+ |
+ PE_CurrentOffsetFrame |
+
+ asynInt32 |
+
+ r |
+
+ Current offset frame being collected when collecting offset frames |
+
+ PE_CURRENT_OFFSET_FRAMEs |
+
+ $(P)$(R)PECurrentOffsetFrame |
+
+ longin |
+
|
PE_AcquireOffset |
asynInt32 |
- w |
+ r/w
- Acquire Offset Image |
+ Acquire offset frames
PE_ACQUIRE_OFFSET |
$(P)$(R)PEAcquireOffset |
- longout |
+ busy
|
@@ -313,9 +332,10 @@
|
asynInt32 |
- w |
+ r/w
- Set wether offset image is to be used |
+ Set whether offset image is to be used. Choices are "Disable" (0) and "Enable" (1).
+
PE_USE_OFFSET |
@@ -331,7 +351,8 @@
|
r |
- Report whether offset image has been collected |
+ Report whether offset image has been collected and is available for use. Choices
+ are "Not available" (0) and "Available" (1).
PE_OFFSET_AVAILABLE |
@@ -351,7 +372,7 @@
|
r/w |
- Number of frames to collect and average when collecting gain image |
+ Number of frames to collect and average when collecting gain frames
PE_NUM_GAIN_FRAMES |
@@ -359,6 +380,22 @@
|
longout |
+
+ |
+ PE_CurrentGainFrame |
+
+ asynInt32 |
+
+ r |
+
+ Current gain frame being collected when collecting gain frames |
+
+ PE_CURRENT_GAIN_FRAMEs |
+
+ $(P)$(R)PECurrentGainFrame |
+
+ longin |
+
|
PE_AcquireGain |
@@ -367,13 +404,13 @@
w |
- Acquire Gain Image |
+ Acquire gain frames
PE_ACQUIRE_GAIN |
$(P)$(R)PEAcquireGain |
- longout |
+ busy
|
@@ -383,7 +420,8 @@
|
w |
- Set wether gain image is to be used |
+ Set whether gain image is to be used. Choices are "Disable" (0) and "Enable" (1).
+
PE_USE_GAIN |
@@ -399,7 +437,8 @@
|
r |
- Report whether gain image has been collected |
+ Report whether offset image has been collected and is available for use. Choices
+ are "Not available" (0) and "Available" (1).
PE_GAIN_AVAILABLE |
@@ -419,7 +458,7 @@
|
w |
- Set wether pixel correction is to be used |
+ Set whether bad pixel correction is to be used
PE_USE_PIXEL_CORRECTION |
@@ -435,7 +474,7 @@
|
r |
- Report whether pixel correction file has been set |
+ Report whether pixel correction file has been set and is available for use
PE_PIXEL_CORRECTION_AVAILABLE |
|