diff --git a/documentation/PerkinElmerDoc.html b/documentation/PerkinElmerDoc.html
index e580b95..0f78b9a 100644
--- a/documentation/PerkinElmerDoc.html
+++ b/documentation/PerkinElmerDoc.html
@@ -34,9 +34,16 @@
This is a driver for the flat-panel amorphous silicon detectors from
PerkinElmer.
- The driver is based upon the library provided by PerkinElmer. It only runs on Microsoft
+ The driver is based upon the XISL library provided by PerkinElmer. It only runs on Microsoft
Windows computers.
+
+ This driver has been tested with the following detectors
+
+ - XRD0820 w/ XRD-FG PCI frame grabber
+ - XRD1621 w/ XRD-FGX PCI frame grabber
+
+
ADD ADDTIONAL INTRODUCTORY TEXT HERE.
@@ -77,6 +84,30 @@
Controls the number of images to acquire when ADImageMode is ADImageMultiple. |
+
+ |
+ ADAcquireTime |
+
+ $(P)$(R)AcquireTime $(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 |
+
+
+ |
+ ADTriggerMode |
+
+ $(P)$(R)TriggerMode $(P)$(R)TriggerMode_RBV |
+
+ Sets the trigger mode for the detector. Options are:
+
+ - Internal
+ - External
+ - Free Run
+ - Soft Trigger
+ |
+
@@ -126,12 +157,308 @@
PE_NUM_FRAME_BUFFERS |
- $(P)$(R)PENumFrameBuffers
+ $(P)$(R)PENumFrameBuffers
$(P)$(R)PENumFrameBuffers_RBV |
- longout
+ longout
longin |
+
+ |
+ PE_Initialize |
+
+ asynInt32 |
+
+ w |
+
+ Initialize the detector |
+
+ PE_INITIALIZE |
+
+ $(P)$(R)PEInitialize |
+
+ longout |
+
+
+ |
+ PE_StatusRBV |
+
+ asynInt32 |
+
+ r/w |
+
+ Status of PerkinElmer driver. Need to integrate this into DetectorState |
+
+ PE_STATUS |
+
+ $(P)$(R)PE_STATUS_RBV |
+
+ mbbi |
+
+
+ |
+ PE_SystemID |
+
+ asynInt32 |
+
+ r/w |
+
+ PROM ID # used in communication with Perkin Elmer |
+
+ PE_SYSTEMID |
+
+ $(P)$(R)PESystemID |
+
+ longin |
+
+
+ |
+ PE_Trigger |
+
+ asynInt32 |
+
+ w |
+
+ Trigger record for soft trigger mode |
+
+ PE_TRIGGER |
+
+ $(P)$(R)PETrigger |
+
+ longout |
+
+ | Offset corrections |
+
+ |
+ PE_NumOffsetFrames |
+
+ asynInt32 |
+
+ r/w |
+
+ Number of frames to collect and average when collecting offset image |
+
+ PE_NUM_OFFSET_FRAMES |
+
+ $(P)$(R)PENumOffsetFrames |
+
+ longout |
+
+
+ |
+ PE_AcquireOffset |
+
+ asynInt32 |
+
+ w |
+
+ Acquire Offset Image |
+
+ PE_ACQUIRE_OFFSET |
+
+ $(P)$(R)PEAcquireOffset |
+
+ longout |
+
+
+ |
+ PE_UseOffset |
+
+ asynInt32 |
+
+ w |
+
+ Set wether offset image is to be used |
+
+ PE_USE_OFFSET |
+
+ $(P)$(R)PEUseOffset |
+
+ mbbo |
+
+
+ |
+ PE_OffsetAvailable |
+
+ asynInt32 |
+
+ r |
+
+ Report whether offset image has been collected |
+
+ PE_OFFSET_AVAILABLE |
+
+ $(P)$(R)PEOffsetAvailable |
+
+ mbbi |
+
+ | Gain corrections |
+
+ |
+ PE_NumGainFrames |
+
+ asynInt32 |
+
+ r/w |
+
+ Number of frames to collect and average when collecting gain image |
+
+ PE_NUM_GAIN_FRAMES |
+
+ $(P)$(R)PENumGainFrames |
+
+ longout |
+
+
+ |
+ PE_AcquireGain |
+
+ asynInt32 |
+
+ w |
+
+ Acquire Gain Image |
+
+ PE_ACQUIRE_GAIN |
+
+ $(P)$(R)PEAcquireGain |
+
+ longout |
+
+
+ |
+ PE_UseGain |
+
+ asynInt32 |
+
+ w |
+
+ Set wether gain image is to be used |
+
+ PE_USE_GAIN |
+
+ $(P)$(R)PEUseGain |
+
+ mbbo |
+
+
+ |
+ PE_GainAvailable |
+
+ asynInt32 |
+
+ r |
+
+ Report whether gain image has been collected |
+
+ PE_GAIN_AVAILABLE |
+
+ $(P)$(R)PEGainAvailable |
+
+ mbbi |
+
+ | Bad pixel corrections |
+
+ |
+ PE_UsePixelCorrections |
+
+ asynInt32 |
+
+ w |
+
+ Set wether pixel correction is to be used |
+
+ PE_USE_PIXEL_CORRECTION |
+
+ $(P)$(R)PEUsePixelCorrection |
+
+ mbbo |
+
+
+ |
+ PE_PixelCorrectionAvailable |
+
+ asynInt32 |
+
+ r |
+
+ Report whether pixel correction file has been set |
+
+ PE_PIXEL_CORRECTION_AVAILABLE |
+
+ $(P)$(R)PEPixelCorrectionAvailable |
+
+ mbbi |
+
+
+
+ |
+ PE_BadPixelFile
+ PE_BadPixelFile_RBV |
+
+ asynOctetWrite
+ aynnOctetRead |
+
+ w |
+
+ File name for bad pixel file |
+
+ PE_BAD_PIXEL_FILE |
+
+ $(P)$(R)PEBadPixelFile
+ $(P)$(R)PEBadPixelFile_RBV |
+
+ waveform |
+
+ | Load/Save offset/gain corrections |
+
+ |
+ PE_CorrectionsDirectory |
+
+ asynOctetWrite |
+
+ r/w |
+
+ Directory where corrections files should be stored |
+
+ PE_CORRECTIONS_DIRECTORY |
+
+ $(P)$(R)PECorrectionsDir |
+
+ waveform |
+
+
+ |
+ PE_LoadCorrectionsFile |
+
+ asynInt32 |
+
+ w |
+
+ Load offset and gain corrections from a file for use |
+
+ PE_LOAD_CORRECTION_FILES |
+
+ $(P)$(R)PELoadCorrections |
+
+ longout |
+
+
+ |
+ PE_SaveCorrectionsFile |
+
+ asynInt32 |
+
+ w |
+
+ Save offset and gain corrections to a file |
+
+ PE_SAVE_CORRECTION_FILES |
+
+ $(P)$(R)PESaveCorrections |
+
+ longout |
+
@@ -140,6 +467,12 @@
The PerkinElmer driver does not support the following standard driver parameters
because they are not supported in the PerkinElmer library:
+ - Size (ADBinX, ADBinY, ADMinX, ADMinY, ADSizeX, ADSizeY)
+ - Type/Color (NDDataType, NDColorMode)
+ - File ( None of the file parameters in NDFile )
+ - Binning (Not supported in software yet )
+ - No Hardware shutter control
+
- List any unsupported parameters here (WORK NEEDED)
@@ -147,7 +480,7 @@
The PerkinElmer driver is created with the perkinElmerConfig command, either from
C/C++ or from the EPICS IOC shell.
- int PerkinElmerConfig(const char *portName, int maxSizeX, int maxSizeY, int dataType,
+ int PerkinElmerConfig(const char *portName, int maxSizeX, int maxSizeY, int dataType,
int maxBuffers, size_t maxMemory,
int priority, int stackSize )
@@ -167,7 +500,7 @@
The following show the MEDM screens that are used to control the PerkinElmer detector.
Note that the general purpose screen ADBase.adl can be used, but it exposes many
controls that are not applicable to the PerkinElmer, and lacks some fields that
- are important for the PerkinElmer.
+ are important for the PerkinElmer driver.
PerkinElmer.adl is the main screen used to control the PerkinElmer
driver.