Skip to content

Commit 65037d1

Browse files
committed
Spelling
1 parent 6d400fc commit 65037d1

13 files changed

+54
-18
lines changed

doc/FAQ.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ How do I view which new IBEX features have been requested or are being worked on
5050

5151
There are internal lists showing priorities available covering the work which will feed into IBEX, please ask the experiment controls group or your group leader if you need to see these. These lists give you an idea of the long term work, and the priorities at that level.
5252
IBEX is released and deployed to each instrument at least once a year, with patches as required. To see what is being worked on for the next release, you will need to find the most recent PI project on https://github.com/orgs/ISISComputingGroup/projects, note that these are in the format PI_YYYY_MM, with the month being the one the PI starts in.
53-
The shortest time scale we consider is a sprint, and you can view this information on github at https://github.com/ISISComputingGroup/IBEX/projects/1.
54-
There is also a long list of issues on github that can be viewed at https://github.com/ISISComputingGroup/IBEX/issues. Please note, this is a rather long list and not very friendly to browse through unless you already know what you're looking for (e.g. a device name).
53+
The shortest time scale we consider is a sprint, and you can view this information on GitHub at https://github.com/ISISComputingGroup/IBEX/projects/1.
54+
There is also a long list of issues on GitHub that can be viewed at https://github.com/ISISComputingGroup/IBEX/issues. Please note, this is a rather long list and not very friendly to browse through unless you already know what you're looking for (e.g. a device name).
5555

5656

5757
Running IBEX
@@ -139,7 +139,7 @@ Scripting in IBEX
139139
In the scripting view I don't want the arguments when I autocomplete
140140
--------------------------------------------------------------------
141141

142-
In the scripting console type `g.` will show a list of possible genie_python commands. If you select one of these or type to narrow down the possibilities, pressing return will autocomplete the method name including the parameters. However, sometimes you will not want all the parameters, so instead of pressing <return> press <crtl> + <return>, this will give only the function name without any parenthesis or arguments.
142+
In the scripting console type `g.` will show a list of possible genie_python commands. If you select one of these or type to narrow down the possibilities, pressing return will autocomplete the method name including the parameters. However, sometimes you will not want all the parameters, so instead of pressing <return> press <ctrl> + <return>, this will give only the function name without any parenthesis or arguments.
143143

144144
When I load script I get an error complaining about unicodeescape
145145
-----------------------------------------------------------------

doc/Glossary.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Glossary
5050
For example, access to a Eurotherm temperature controller is controlled via an IOC process that provides
5151
Process Variable for the relevant control elements
5252

53-
OPI (OPerator Interface)
53+
OPI (Operator Interface)
5454
An OPI is a user interface element of IBEX. In essence, an OPI is a control panel for an individual device attached to an instrument. It allows you to view and modify the PVs that define the state of the device. For example, an OPI is displayed when you click on a device icon on a synoptic view.
5555

5656
PV (Process Variable)

doc/IBEX-File-Paths-page.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ The installation of IBEX is common for most instruments you shouldn't need to de
1111

1212
* Configurations: ``C:\Instrument\Settings\config\<computer>\configurations`` this directory contains configuration, components and IOC specific configuration. The IOC specific configurations include:
1313

14-
- galil: ``galil`` galil motor configurations for all controllers, including jaws, axes and motion setpoint commands but not value
14+
- Galil: ``galil`` Galil motor configurations for all controllers, including jaws, axes and motion setpoint commands but not value
1515
- motion setpoints: ``motionSetPoints`` the motion setpoints
1616
- refl: ``refl\config.py`` default reflectometry configuration
1717
- DAE tables: ``tables`` contains wiring, spectra and detector tables for the DAE
18-
- TCB files: ``tcb`` contains the tcb files
18+
- TCB files: ``tcb`` contains the TCB files
1919

2020
* Common calibration files: ``C:\Instrument\Settings\config\common`` calibration files for instruments e.g. Eurotherm sensors
2121

doc/device_specific/FZJ-Fermi-Chopper.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ Crate does not respond / Crate responds infrequently
130130
An issue was seen when first commissioning the MAPS Fermi under EPICS. Symptoms were very odd:
131131

132132
- Cannot communicate using VISA nor Asyn under EPICS
133-
- If chopper crate and instrument PC are power cycled, may need to run labview driver once before epics can talk. We are still not sure why this is.
134-
- If EPICS+Visa is subsequently run, it will upset the comms and will need to run the labview to "clear" the error
133+
- If chopper crate and instrument PC are power cycled, may need to run LabVIEW driver once before epics can talk. We are still not sure why this is.
134+
- If EPICS+Visa is subsequently run, it will upset the comms and will need to run the LabVIEW to "clear" the error
135135

136136
**Shortened status command [Specific to Maps]**
137137
On MAPS, the crate's communications layer can fail, causing the device to ignore the standard polling command (``#0000000$``). To recover from this state, send the shortened command ``0$`` repeatedly until you get a response. The IOC should automatically do this whenever it detects no response to the standard command.

doc/device_specific/Lakeshore-340.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ They are loaded from the instrument config area for example on MUSR `Instrument\
1212
18,100 nA
1313
```
1414

15-
The file is read from top to bottom and the first temperature threshold that is greater than the temperature setpoint on the lakeshore 340 is the line that is selected. Subsequently, the IOC will wait for the temperature to reach the setpoint and then set the excitation to the value on the same file line as the matching temperature threshold. If no temperature threshold is found to match the file then the last excitation listed in the file will be set.
15+
The file is read from top to bottom and the first temperature threshold that is greater than the temperature setpoint on the Lakeshore 340 is the line that is selected. Subsequently, the IOC will wait for the temperature to reach the setpoint and then set the excitation to the value on the same file line as the matching temperature threshold. If no temperature threshold is found to match the file then the last excitation listed in the file will be set.
1616

1717
If the set file contains invalid values or does not exist then the OPI will display this on the excitations tab.

doc/how_to/Create-and-Manage-Configurations.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ On clicking the ``Select PV`` button, IBEX will display a list of PVs available
112112

113113
``All IOCs`` to see PVs from all IOCs on your instrument (this can result in a very long list of PVs).
114114

115-
``Active IOCs`` to see PVs only from IOcs that are currently running on your instrument.
115+
``Active IOCs`` to see PVs only from IOCs that are currently running on your instrument.
116116

117117
``Config IOCs`` to see PVs only from IOCs included in the current configuration.
118118

doc/inst_specific/Engin-X-Sample-Stack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Engin-X Sample Stack
22

3-
The Engin X Sample Stack is controlled through IBEX but underneath IBEX link back into labview VIs from SECI hence why there are some special steps you need to use when looking at it. If you can't find the answer you are looking for in this page there is more information in the [developer wiki but beware this is quite low level](https://isiscomputinggroup.github.io/ibex_developers_manual/specific_iocs/motors/EnginX-Sample-Positioner.html).
3+
The Engin X Sample Stack is controlled through IBEX but underneath IBEX link back into LabVIEW VIs from SECI hence why there are some special steps you need to use when looking at it. If you can't find the answer you are looking for in this page there is more information in the [developer wiki but beware this is quite low level](https://isiscomputinggroup.github.io/ibex_developers_manual/specific_iocs/motors/EnginX-Sample-Positioner.html).
44

55
## Define a Motor Position on the Engin-X Sample Stack
66
- Using a file explorer, go to the following location on `ndxenginx`: `C:\Labview Modules\Drivers\Galil DMC2280`

doc/inst_specific/Guidance-on-Writing-Scripts-for-the-Muon-Front-End.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Starting & Stopping Runs Remotely
1010

1111
Ensuring the control machine has sufficient permission to begin a run
1212
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13-
The relevant code can be found in the github repository:
13+
The relevant code can be found in the GitHub repository:
1414

1515
https://github.com/ISISComputingGroup/mfe_control_scripts
1616

doc/introduction/What-Is-IBEX.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Using the IBEX GUI is the primary focus of this whole manual, as it is through t
2222
Introduction to genie_python
2323
------------------------------------------------
2424

25-
A full reference to genie_python is available `on github <https://isiscomputinggroup.github.io/genie/genie_python>`_ or internally `on shadow <http://shadow.nd.rl.ac.uk/genie_python/sphinx/genie_python.html>`_.
25+
A full reference to genie_python is available `on GitHub <https://isiscomputinggroup.github.io/genie/genie_python>`_ or internally `on shadow <http://shadow.nd.rl.ac.uk/genie_python/sphinx/genie_python.html>`_.
2626

2727
Previous Instrument Control at ISIS
2828
------------------------------------------------

doc/scripting/Alerts-on-Blocks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Alerts on Blocks
22

3-
Alerts can be configured on blocks using genie python, there is no GUI for this at the moment. An alert will trigger when a block is outside of the specified `lowlimit,highlimit` range for the specified `delay_out` time, it is like run control but rather than putting the DAE into WAITING a message (via sms text and/or email) is sent. When the value comes back in range, it must be in range for `delay_in` seconds until an in-range alert is sent.
3+
Alerts can be configured on blocks using genie python, there is no GUI for this at the moment. An alert will trigger when a block is outside of the specified `lowlimit,highlimit` range for the specified `delay_out` time, it is like run control but rather than putting the DAE into WAITING a message (via SMS text and/or email) is sent. When the value comes back in range, it must be in range for `delay_in` seconds until an in-range alert is sent.
44

55
Note that this system is in addition to and independent of run control, it just uses some of the same underlying software. Alerts can be added to blocks that are not under run control, and both run control and alerts can bet set on the same block. The limits and delay times need not be the same for the run control and alert elements, so the instrument could be configured to go into a WAITING state when a block exceeded 100K but not send an alert until it exceeded 120K for a given length of time etc. (see below for how to set an alert on how long an instrument has been in a WAITING state)
66

@@ -34,7 +34,7 @@ g.alerts.status()
3434
g.cset("block1", -50) # With above settings, message sent to say the block has gone out of range
3535
g.cset("block1", 0) # With above settings, message sent to say the block has gone back in range
3636
```
37-
Alerts are saved across IBEX restarts, but the saving is not currently part of a configuration. The block related alert parameters will remain so long as the block exists (the email and sms parameters are always preserved), so you can change configuration and maintain an alert so long as the block continues to exists. If you change to a configuration where the block does not exist, then you lose those block specific alert settings. So it is best to create the blocks used for alerts as part of a common base component included in all configurations.
37+
Alerts are saved across IBEX restarts, but the saving is not currently part of a configuration. The block related alert parameters will remain so long as the block exists (the ``email`` and ``sms`` parameters are always preserved), so you can change configuration and maintain an alert so long as the block continues to exists. If you change to a configuration where the block does not exist, then you lose those block specific alert settings. So it is best to create the blocks used for alerts as part of a common base component included in all configurations.
3838

3939
Alerts, like run control, are normally set on floating point (or integer) value blocks. They can, however, be used on some "state" items that are symbolic names mapped to integers (enums). One example of this is the instrument state (SETUP=1,RUNNING=2,PAUSED=3,WAITING=4,VETOING=5) so if a block called `RunState` is attached to the process variable `IN:myinst:DAE:RUNSTATE` then
4040
```python

0 commit comments

Comments
 (0)