From 5ba5589ea28ad7d02632c6ce2a31bd33dd805282 Mon Sep 17 00:00:00 2001 From: rivers Date: Mon, 22 Mar 2010 18:45:39 +0000 Subject: [PATCH] Minor fixes git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@10305 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- documentation/FirewireWinDoc.html | 8 +-- documentation/Mar345Doc.html | 31 +++++----- documentation/MarCCDDoc.html | 11 ++-- documentation/NDPluginColorConvert.html | 4 +- documentation/NDPluginFile.html | 16 ++--- documentation/NDPluginProcess.html | 14 ++--- documentation/NDPluginROI.html | 8 +-- documentation/NDPluginStats.html | 8 +-- documentation/NDPluginStdArrays.html | 4 +- documentation/PerkinElmerDoc.html | 79 ++++++++++++++----------- documentation/RoperDoc.html | 11 ++-- documentation/pilatusDoc.html | 11 ++-- documentation/prosilicaDoc.html | 4 +- documentation/pvcamDoc.html | 11 ++-- documentation/simDetectorDoc.html | 4 +- documentation/todo.txt | 20 +++++-- 16 files changed, 136 insertions(+), 108 deletions(-) diff --git a/documentation/FirewireWinDoc.html b/documentation/FirewireWinDoc.html index f6c3e3e..dc6fad4 100755 --- a/documentation/FirewireWinDoc.html +++ b/documentation/FirewireWinDoc.html @@ -559,8 +559,8 @@

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 mar345ScanSize. + the parameter index variable names have been split into 2 lines, but these are just + a single name, for example mar345ScanSize.

@@ -570,7 +570,7 @@ + Parameter index variable + drvInfo string + Parameter index variable + 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.
- Enum name asyn interface @@ -578,7 +578,7 @@ Description - drvUser string EPICS record name diff --git a/documentation/Mar345Doc.html b/documentation/Mar345Doc.html index e89caa4..3748748 100755 --- a/documentation/Mar345Doc.html +++ b/documentation/Mar345Doc.html @@ -75,7 +75,7 @@
- Enum name EPICS record name @@ -141,15 +141,17 @@ $(P$(R)FileTemplate - 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.
@@ -181,8 +183,9 @@ mar345 specific parameters

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 mar345ScanSize. + 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 mar345ScanSize.

@@ -192,7 +195,7 @@ + Parameter index variable + drvInfo string + Parameter index variable
- Enum name asyn interface @@ -200,7 +203,7 @@ Description - drvUser string EPICS record name diff --git a/documentation/MarCCDDoc.html b/documentation/MarCCDDoc.html index 3b432ce..d32f466 100755 --- a/documentation/MarCCDDoc.html +++ b/documentation/MarCCDDoc.html @@ -88,7 +88,7 @@ remote_mode_server_arguments 2222
- Enum name EPICS record name @@ -174,8 +174,9 @@ remote_mode_server_arguments 2222 MarCCD specific parameters

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 marCCDState. + 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 marCCDState.

@@ -185,7 +186,7 @@ remote_mode_server_arguments 2222 + Parameter index variable + drvInfo string + Parameter index variable + drvInfo string + Parameter index variable + drvInfo string
- Enum name asyn interface @@ -193,7 +194,7 @@ remote_mode_server_arguments 2222 Description - drvUser string EPICS record name diff --git a/documentation/NDPluginColorConvert.html b/documentation/NDPluginColorConvert.html index 2c2dee8..a5b9538 100755 --- a/documentation/NDPluginColorConvert.html +++ b/documentation/NDPluginColorConvert.html @@ -50,7 +50,7 @@
- Enum name asyn interface @@ -58,7 +58,7 @@ Description - drvUser string EPICS record name diff --git a/documentation/NDPluginFile.html b/documentation/NDPluginFile.html index a009d86..9a217db 100755 --- a/documentation/NDPluginFile.html +++ b/documentation/NDPluginFile.html @@ -346,7 +346,7 @@ variables:
- Enum name asyn interface @@ -354,7 +354,7 @@ variables: Description - drvUser string EPICS record name @@ -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.

-

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.

+

+ 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.

Screen shots

diff --git a/documentation/NDPluginProcess.html b/documentation/NDPluginProcess.html index d9e95fd..03d1d28 100755 --- a/documentation/NDPluginProcess.html +++ b/documentation/NDPluginProcess.html @@ -66,9 +66,9 @@ NDPluginProcess.h defines the following parameters. It also implements all of the standard plugin parameters from NDPluginDriver. 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 - NDPluginProcessSaveBackground. + 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 NDPluginProcessSaveBackground.

@@ -86,7 +86,7 @@ + drvInfo string
Description - drvUser string EPICS record name @@ -977,9 +977,9 @@ NDProcessConfigure(const char *portName, int queueSize, int blockingCallbacks, Screen shots

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.

diff --git a/documentation/NDPluginROI.html b/documentation/NDPluginROI.html index 5bc4661..8e41d66 100755 --- a/documentation/NDPluginROI.html +++ b/documentation/NDPluginROI.html @@ -64,9 +64,9 @@ NDPluginROI.h defines the following parameters. It also implements all of the standard plugin parameters from NDPluginDriver. 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 - NDPluginROIName. + 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 NDPluginROIName.

@@ -84,7 +84,7 @@ + drvInfo string
Description - drvUser string EPICS record name diff --git a/documentation/NDPluginStats.html b/documentation/NDPluginStats.html index 2219dfb..e849d31 100755 --- a/documentation/NDPluginStats.html +++ b/documentation/NDPluginStats.html @@ -40,9 +40,9 @@ NDPluginStats.h defines the following parameters. It also implements all of the standard plugin parameters from NDPluginDriver. 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 - NDPluginStatsComputeStatistics. + 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 NDPluginStatsComputeStatistics.

@@ -60,7 +60,7 @@ + drvInfo string + Parameter index variable + drvInfo string + Parameter index variable + 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
Description - drvUser string EPICS record name diff --git a/documentation/NDPluginStdArrays.html b/documentation/NDPluginStdArrays.html index 95f8bad..c73c8e5 100755 --- a/documentation/NDPluginStdArrays.html +++ b/documentation/NDPluginStdArrays.html @@ -54,7 +54,7 @@
- Enum name asyn interface @@ -62,7 +62,7 @@ Description - drvUser string EPICS record name diff --git a/documentation/PerkinElmerDoc.html b/documentation/PerkinElmerDoc.html index a8247e1..a79a8c8 100644 --- a/documentation/PerkinElmerDoc.html +++ b/documentation/PerkinElmerDoc.html @@ -34,15 +34,15 @@ This is a 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. + 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
    • -
+
    +
  • XRD0820 w/ XRD-FG PCI frame grabber
    • +
  • XRD1621 w/ XRD-FGX PCI frame grabber
    • +

ADD ADDTIONAL INTRODUCTORY TEXT HERE.

@@ -69,7 +69,7 @@

- Enum name EPICS record name @@ -87,21 +87,21 @@ ADAcquireTime - $(P)$(R)AcquireTime
+ $(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
$(P)$(R)TriggerMode_RBV		 - Sets the trigger mode for the detector. Options are: + Sets the trigger mode for the detector. Options are:
  • Internal
  • External
    • @@ -122,8 +122,8 @@

    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 PerkinElmerXXX. + the parameter index variable names have been split into 2 lines, but these are just + a single name, for example PerkinElmerXXX.

    @@ -133,7 +133,7 @@ + Parameter index variable + drvInfo string @@ -189,7 +189,7 @@ + Status of PerkinElmer driver. Need to integrate this into DetectorState - + + + @@ -326,7 +329,10 @@ - + + + @@ -391,7 +397,10 @@ - + + + @@ -424,13 +433,11 @@ - + PE_BadPixelFile PE_BadPixelFile_RBV @@ -439,12 +446,15 @@ - + + + @@ -501,12 +511,11 @@ 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
      • - +
    • 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)

    diff --git a/documentation/RoperDoc.html b/documentation/RoperDoc.html index 258b21d..c30543b 100755 --- a/documentation/RoperDoc.html +++ b/documentation/RoperDoc.html @@ -91,7 +91,7 @@

    + Parameter index variable
    - Enum name asyn interface @@ -141,7 +141,7 @@ Description - drvUser string EPICS record name @@ -159,10 +159,10 @@ PE_NUM_FRAME_BUFFERS - $(P)$(R)PENumFrameBuffers
    + $(P)$(R)PENumFrameBuffers
    $(P)$(R)PENumFrameBuffers_RBV    		 - longout
    + longout
    longin
    r/w - Status of PerkinElmer driver. Need to integrate this into DetectorState PE_STATUS @@ -261,7 +261,10 @@ longout
    Offset corrections
    + Offset corrections
    PE_NumOffsetFrames mbbi
    Gain corrections
    + Gain corrections
    PE_NumGainFrames mbbi
    Bad pixel corrections
    + Bad pixel corrections
    PE_UsePixelCorrections mbbi
    - PE_BadPixelFile - PE_BadPixelFile_RBV - asynOctetWrite
    + asynOctetWrite
    aynnOctetRead    		 w PE_BAD_PIXEL_FILE - $(P)$(R)PEBadPixelFile
    + $(P)$(R)PEBadPixelFile
    $(P)$(R)PEBadPixelFile_RBV    		 waveform
    Load/Save offset/gain corrections
    + Load/Save offset/gain corrections
    PE_CorrectionsDirectory
    - Enum name EPICS record name @@ -200,8 +200,9 @@ Roper specific parameters

    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 marCCDState. + 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 marCCDState.

    @@ -211,7 +212,7 @@ + Parameter index variable + drvInfo string + Parameter index variable
    - Enum name asyn interface @@ -219,7 +220,7 @@ Description - drvUser string EPICS record name diff --git a/documentation/pilatusDoc.html b/documentation/pilatusDoc.html index 70c45b5..a3b232b 100755 --- a/documentation/pilatusDoc.html +++ b/documentation/pilatusDoc.html @@ -66,7 +66,7 @@
    - Enum name EPICS record name @@ -194,8 +194,9 @@ test6_2_0035.tif test6_2_0035.tif, test6_2_0036.tif, ... Pilatus specific parameters

    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 PilatusDelayTime. + 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 PilatusDelayTime.

    @@ -205,7 +206,7 @@ test6_2_0035.tif test6_2_0035.tif, test6_2_0036.tif, ... + Parameter index variable + drvInfo string + Parameter index variable + drvInfo string + Parameter index variable
    - Enum name asyn interface @@ -213,7 +214,7 @@ test6_2_0035.tif test6_2_0035.tif, test6_2_0036.tif, ... Description - drvUser string EPICS record name diff --git a/documentation/prosilicaDoc.html b/documentation/prosilicaDoc.html index 5116ef0..d5374eb 100755 --- a/documentation/prosilicaDoc.html +++ b/documentation/prosilicaDoc.html @@ -110,7 +110,7 @@
    - Enum name asyn interface @@ -118,7 +118,7 @@ Description - drvUser string EPICS record name diff --git a/documentation/pvcamDoc.html b/documentation/pvcamDoc.html index 8a393e3..637d212 100644 --- a/documentation/pvcamDoc.html +++ b/documentation/pvcamDoc.html @@ -68,7 +68,7 @@
    - Enum name EPICS record name @@ -88,8 +88,9 @@ PVCAM specific parameters

    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 PVCamInitDetector. + 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 PVCamInitDetector.

    @@ -99,7 +100,7 @@ + Parameter index variable + drvInfo string + Parameter index variable + drvInfo string
    - Enum name asyn interface @@ -107,7 +108,7 @@ Description - drvUser string EPICS record name diff --git a/documentation/simDetectorDoc.html b/documentation/simDetectorDoc.html index 087e8dd..a6ce68f 100755 --- a/documentation/simDetectorDoc.html +++ b/documentation/simDetectorDoc.html @@ -62,7 +62,7 @@
    - Enum name asyn interface @@ -70,7 +70,7 @@ Description - drvUser string EPICS record name diff --git a/documentation/todo.txt b/documentation/todo.txt index 9cb20cd..04e2002 100644 --- a/documentation/todo.txt +++ b/documentation/todo.txt @@ -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