From 987c13a030c439a97219db46de1ea5bcd831d68c Mon Sep 17 00:00:00 2001 From: rivers Date: Mon, 20 Jun 2011 03:53:28 +0000 Subject: [PATCH] Removed references to writing TIFF files in driver, which is not longer supported; added note about using IP address or IP DNS name instead of UniqueId in constructor and prosilicaConfig command git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@12957 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b --- documentation/prosilicaDoc.html | 35 +++++++++++++-------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/documentation/prosilicaDoc.html b/documentation/prosilicaDoc.html index 9bc8b1f..49777e4 100755 --- a/documentation/prosilicaDoc.html +++ b/documentation/prosilicaDoc.html @@ -36,12 +36,6 @@ to a user-supplied function each time there is a new frame. Thus, the driver does not need to create a thread itself for callbacks."

-

- The vendor library supports saving individual frames as TIFF files, and this is - implemented in the driver. Other file plugins, such as the - NDFileNetCDF plugin can be used to capture or stream images much more rapidly - in the netCDF file format. -

This driver inherits from ADDriver. It implements nearly all of the parameters in @@ -69,14 +63,6 @@ The Prosilica supports hardware timing input and output signals that are supported in the driver.

-

- The NDFileFormat choices for the Prosilica are: -

-

The NDDataType choices for the Prosilica are:

@@ -675,21 +661,28 @@ The Prosilica driver is created with the prosilicaConfig command, either from C/C++ or from the EPICS IOC shell.

int prosilicaConfig(char *portName,
-                    int uniqueId,
+                    const char* cameraId,
                     int maxBuffers, size_t maxMemory,
                     int priority, int stackSize)

- The uniqueId parameter is a unique number assigned to each Prosilica camera. - areaDetector uses this number, rather than the TCP/IP address, to find the camera - and connect to it. This is done so that the cameras can be configured to use DHCP, - and hence have non-predictable TCP/IP addresses. This does mean that areaDetector + The cameraId string can be any of the following:

+ +

Using the UniqueId has the advantage that the cameras can be configured to use DHCP, + and hence have non-predictable TCP/IP addresses. However, if the UniqueId is used then the areaDetector IOC must be on the same subnet as the camera, since cameras cannot be found by UniqueID through routers. The simplest way to determine the uniqueId of a camera is to run the Prosilica GigEViewer application, select the camera, and press the "i" icon on the bottom of the main window to show the camera information for this camera. - The Unique ID will be displayed on the first line in the information window. For - details on the meaning of the other parameters to this function refer to the detailed + The Unique ID will be displayed on the first line in the information window.

+

The IP address or IP DNS name + can be used for cameras with fixed IP addresses, and must be used for cameras that are not + on the local subnet.

+

For details on the meaning of the other parameters to this function refer to the detailed documentation on the prosilicaConfig function in the prosilica.cpp documentation and in the documentation for the constructor for the prosilica class.