diff --git a/PixelatorControllerSettings.md b/PixelatorControllerSettings.md index 5dffc39..14d40f4 100644 --- a/PixelatorControllerSettings.md +++ b/PixelatorControllerSettings.md @@ -126,7 +126,7 @@ Each of these settings files is described in a section below.  [Axis](#axis) **controllerConfigFileName**::
- [Controller](#controller) + [Controller](Config_Controller) **detectorConfigFileName**::
 [Detector](#detector) @@ -150,7 +150,7 @@ Each of these settings files is described in a section below.  [Polarization](#polarization) **positionerConfigFileName**::
- [Positioner](#positioner) + [Positioner](Config_Positioner) **topupConfigFileName**::
 **Optional**: no topup handling when this setting is missing or the file cannot be read.
@@ -162,61 +162,6 @@ Each of these settings files is described in a section below. ## Axis Definition of coordinate axes names to be referenced by positioners with the **axisName** setting. -## Controller -Definition of a set of hardware controllers. - - **type**::
- String value that identifies which hardware interface will handle the controller behaviour. The set of allowed values is listed near the beginning of [`Controller.h`](https://gitlab.psi.ch/microspectro/pixelator/-/blob/master/PixelatorController/src/Controller.h#L19), for example: - -`enum Type { NewPort, NexLine, SmarAct, SmarActUsb, SmarActTcp, Orchestra, Galil, Zaber, ZmiEpics };` - - **active**::
- Integer value that defines if the controller should be used (value of 1) or ignored (value of 0).
- **Default**: 0 - - **serverAddress**::
- String value that defines the network address where the controller can be accessed. Used together with **serverPort**
- **Default**: ? - - **serverPort**::
- Integer value that defines the port over which the controller can be accessed. Used together with **serverAddress**
- **Default**: ? - - **deviceName**::
- String value that defines the filesystem path where the controller can be accessed.
- **Default**: ? - - **timeout**::
- Float value that defines the controller timeout.
- **Default**: ? - - **loopName**::
- String value that defines which Orchestra loop the controller is associated with.
- **Default**: ? - - **nAxes**::
- Integer value that defines the number of `axis` objects that the controller handles.
- **Default**: ? - - **baudRate**::
- Integer value that defines communication rate of the controller.
- **Default**: ? - - -## Detector -Definitions of the set of detector hardware available. - - **active**::
- Integer value that defines if the detector should be used (value of 1) or ignored (value of 0).
- **Default**: 0 - - - **type**::
- String value that identifies which hardware interface will handle the detector behaviour. The set of allowed values is listed near the beginning of [`Detector.h`](https://gitlab.psi.ch/microspectro/pixelator/-/blob/master/PixelatorController/src/Detector.h#L23), for example: - -`enum Type { Base, Counter, Analog, Interferometer, Orchestra, Epics, Tcp, Zmq };` - - ## Epics This file contains global epics settings. @@ -349,5 +294,4 @@ See source:trunk/PixelatorController/config/pixelClock.json for an example.  Double value defines the timeout (in seconds) used in waitUntilDone(). running() is called until it returns false or until waitUntilDoneTimeout is exceeded.
 **Default**: 10.0 -## Polarization - +## Polarization \ No newline at end of file