Skip to content

Commit 3ce143b

Browse files
committed
Spell-check
1 parent e023e48 commit 3ce143b

File tree

4 files changed

+50
-49
lines changed

4 files changed

+50
-49
lines changed

doc/processes/instrument_details/ARGUS-Instrument-Details.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Low temperature experiments?[Neocera LTC-21 Manual](http://www.submm.caltech.edu
9090
{#argus_note-lakeshore}
9191
##### Note: LakeShore #####
9292
1. [Model 332](https://www.lakeshore.com/products/Cryogenic-Temperature-Controllers/Model-332/Pages/Overview.aspx) temperature controller. Model 332 has now been superseded by [Model 335](https://www.lakeshore.com/products/Cryogenic-Temperature-Controllers/Model-335/Pages/Overview.aspx).
93-
1. On muon instruments, the Triton fridges have an additional Lakeshore controller (the 372) to allow control and continuous readout of the sample temperature (the OI software doesnt allow this using the in-built Lakeshore, despite the unit having a dedicated channel for the sample thermometry).
93+
1. On muon instruments, the Triton fridges have an additional Lakeshore controller (the 372) to allow control and continuous readout of the sample temperature (the OI software doesn't allow this using the in-built Lakeshore, despite the unit having a dedicated channel for the sample thermometry).
9494
1. [Model 372](https://www.lakeshore.com/products/categories/overview/temperature-products/ac-resistance-bridges/model-372-ac-resistance-bridge-temperature-controller) temperature controller.
9595
1. [Model 460](https://www.lakeshore.com/products/Gaussmeters/Model-460-3-Channel-Gaussmeter/Pages/Overview.aspx) gaussmeter. Model 460 has now been superseded by [Model F71](https://www.lakeshore.com/products/Gaussmeters/F71-F41-teslameters/Pages/Overview.aspx).
9696
1. There are [EPICS drivers](https://epics-controls.org/resources-and-support/modules/hardware-support/) for a variety of Lakeshore devices.
@@ -107,6 +107,10 @@ Low temperature experiments?[Neocera LTC-21 Manual](http://www.submm.caltech.edu
107107
* The VI appears to date from 2004.
108108
* This model of dilution fridge (the GHS-2T-1T-700) is probably obsolete. It is no longer listed on the web-site.
109109

110+
{#argus_note-mclennan}
111+
##### Note: McLennan #####
112+
Support for McLennan devices is well established (see [#1099](https://github.com/ISISComputingGroup/IBEX/issues/1099) and [#1100](https://github.com/ISISComputingGroup/IBEX/issues/1100) and subsequent tickets.
113+
* muon instruments don't use motors in their sample environment
110114

111115
## ARGUS SECI Configs ##
112116
Document information about ARGUS SECI configs here.
@@ -136,7 +140,3 @@ Manufacturer | Model | Type | Connection | Driver | Notes |
136140
------------ | ------------- | ------------- | ------------- | ------------- | -------------------------------------------
137141
GALIL | [DMC2280](http://www.galilmc.com/products/dmc-22x0.php) | Motion Controller | Ethernet | [EPICS](http://www.aps.anl.gov/epics/modules/manufacturer.php#Galil%20Motion%20Control) | |
138142
McLennan | PM600 | Motion Controller | RS-232 | [EPICS](http://www.aps.anl.gov/epics/modules/manufacturer.php#McLennan%20Servo%20Supplies) | [see McLennan note](#argus_note-mclennan)
139-
140-
##### Note: McLennan #####
141-
Support for McLennan devices is well established (see [#1099](https://github.com/ISISComputingGroup/IBEX/issues/1099) and [#1100](https://github.com/ISISComputingGroup/IBEX/issues/1100) and subsequent tickets.
142-
* muon instruments don't use motors in their sample environment

doc/processes/instrument_details/HIFI-Instrument-Details.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ There is a project relating to the motion on the South Side Muons in progress, t
4545
##### Note: Jaws #####
4646
Provide information about HIFI jaws.
4747

48-
{#hifi_note-vacuum}
48+
{#hifi_note-vacuum-system}
4949
##### Note: Vacuum System #####
5050
TPG300 support is implemented via [#216](https://github.com/ISISComputingGroup/IBEX/issues/216) and [#2063](https://github.com/ISISComputingGroup/IBEX/issues/2063)
5151

@@ -63,7 +63,7 @@ There appears to be no driver for the Aeroflex 2023A in `C:\LabVIEW Modules\`. H
6363
##### Note: Water Baths #####
6464
1. Julabo Water Bath
6565
* no information on specific Julabo Water Baths - maybe HIFI uses water baths from the pool?
66-
* consult the [Julabo commands](https://github.com/ISISComputingGroup/ibex_developers_manual/wiki/backend_system/IOCs/julabo_commands.xlsx) spreadsheet for specific details of which set of commands are used individual water baths.
66+
* consult the [Julabo commands](/specific_iocs/temp_controllers/julabo_commands.xlsx) spreadsheet for specific details of which set of commands are used individual water baths.
6767
1. Haake Water Bath is now obsolete (replaced by Julabo, according to instrument scientist)
6868
* ~Haake Water Bath (apparently the following Haake water bath: WB9)~
6969
* ~Haake N6 Water Bath. Haake has now been taken over by [ThermoFisher](https://www.thermofisher.com/uk/en/home/life-science/lab-equipment/water-baths-circulators-chillers.html). N6 model may be obsolete. Check existing SECI VI for logic and manual (see `C:\LabVIEW Modules\Drivers\Haake N6`).~
@@ -95,7 +95,7 @@ See also `C:\LabVIEW Modules\Drivers\Caen`.
9595
1. [Model 218](http://www.lakeshore.com/products/Cryogenic-Temperature-Monitors/Model-218/Pages/Overview.aspx):
9696
1. [Model 336](http://www.lakeshore.com/products/cryogenic-temperature-controllers/model-336/Pages/Overview.aspx):
9797
1. [Model 340](http://www.lakeshore.com/products/Cryogenic-Temperature-Controllers/Model-340/Pages/Overview.aspx): this model is now obsolete, having been replaced by the 336 and 350 models.
98-
1. On muon instruments, the Triton fridges have an additional Lakeshore controller (the 372) to allow control and continuous readout of the sample temperature (the OI software doesnt allow this using the in-built Lakeshore, despite the unit having a dedicated channel for the sample thermometry).
98+
1. On muon instruments, the Triton fridges have an additional Lakeshore controller (the 372) to allow control and continuous readout of the sample temperature (the OI software doesn't allow this using the in-built Lakeshore, despite the unit having a dedicated channel for the sample thermometry).
9999
1. [Model 372](https://www.lakeshore.com/products/categories/overview/temperature-products/ac-resistance-bridges/model-372-ac-resistance-bridge-temperature-controller) temperature controller.
100100
1. There are [EPICS drivers](https://epics-controls.org/resources-and-support/modules/hardware-support/) for a variety of Lakeshore temperature controllers.
101101

doc/processes/instrument_details/OFFSPEC-Instrument-Details.md

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,48 @@ OFFSPEC will migrate from the SECI control system to the IBEX control system in
1818
The equipment listed below is used on OFFSPEC. Please add new information (e.g. new items of equipment, new notes, information about drivers, etc. to this table).
1919

2020

21-
| VI | Config(s) | Config last updated | IBEX equivalent |
22-
| --- | --- | --- | --- |
23-
| `beam logger.vi` | | | standard IBEX |
24-
| `dae control.vi` | | | standard IBEX / ISISDAE |
25-
| `delft/coldasever.vi` | `OFFSPEC-DELFT-MAIN.conf` | 18/05/2022 | https://github.com/ISISComputingGroup/IBEX/issues/7437 |
26-
| eurotherm | | | EUROTHRM |
27-
| galil ToM | | | standard IBEX / GALIL |
28-
| Glassman LV power supply | `OFFSPEC - no logging.conf` | 2019 | Obsolete, not required |
29-
| Hitachi L7100 | | | *Obsolete* |
30-
| Mk3 Chopper | | | MK3CHOPR |
31-
| Jasco 4180 | | | JSCO4180 |
32-
| Julabo (several models) | | | JULABO |
33-
| Kepco | | | KEPCO |
34-
| Keyence TM 3001P | | | KYNCTM3K |
35-
| Knauer K-6 | | | KNRK6 |
36-
| Knauer 1050 | | | KNR1050 |
37-
| motion control (various) | | | REFL - assume being handled in https://github.com/ISISComputingGroup/IBEX/issues/6245 |
38-
| Newport SMC100 | | | SMC100 |
39-
| Nima Trough | | | NIMATRO |
40-
| Mercury ITC | | | MERCURY_ITC |
41-
| SM300-5 (power supply) | | | https://github.com/ISISComputingGroup/IBEX/issues/4461 |
42-
| Tektronix AFG 3000 series | | | TEKAFG3XXX |
43-
| Thurlby EX355P | | | TTIEX355P |
44-
| Thurlby TGA1240 | | | None (hardware is obsolete; functionality to be replaced by Tektronix function generators - we should not need to convert this driver) |
45-
| Thurlby TSX 3510P | all | - | https://github.com/ISISComputingGroup/IBEX/issues/7434 |
46-
| Aladdin-1000 syringe pump | | | ALDN1000 |
47-
| WPI 2XX syringe pump | | | SP2XX |
48-
| inter galil dio | | | Digital i/o already covered in GALIL ioc |
49-
| surf galil dio| | | Digital i/o already covered in GALIL ioc |
50-
| `delft_dc_mc - front panel.vi` | | | https://github.com/ISISComputingGroup/IBEX/issues/7492 |
51-
| `delft/eltromatdriver` | all | - | https://github.com/ISISComputingGroup/IBEX/issues/7494 |
52-
| `delft/hfcontroldriver` | DELFT, NIMA, "Single Config" | 2011/2012 | Deprecated, not required |
53-
| hydrocell | | | One-off user kit; not required |
21+
| VI | Config(s) | Config last updated | IBEX equivalent |
22+
|--------------------------------------| --- | --- | --- |
23+
| `beam logger.vi` | | | standard IBEX |
24+
| `dae control.vi` | | | standard IBEX / ISISDAE |
25+
| `delft/coldasever.vi` | `OFFSPEC-DELFT-MAIN.conf` | 18/05/2022 | https://github.com/ISISComputingGroup/IBEX/issues/7437 |
26+
| Eurotherm | | | EUROTHRM |
27+
| galil | | | standard IBEX / GALIL |
28+
| Glassman LV power supply | `OFFSPEC - no logging.conf` | 2019 | Obsolete, not required |
29+
| Hitachi L7100 | | | *Obsolete* |
30+
| Mk3 Chopper | | | MK3CHOPR |
31+
| Jasco 4180 | | | JSCO4180 |
32+
| Julabo (several models) | | | JULABO |
33+
| Kepco | | | KEPCO |
34+
| Keyence TM 3001P | | | KYNCTM3K |
35+
| Knauer K-6 | | | KNRK6 |
36+
| Knauer 1050 | | | KNR1050 |
37+
| motion control (various) | | | REFL - assume being handled in https://github.com/ISISComputingGroup/IBEX/issues/6245 |
38+
| Newport SMC100 | | | SMC100 |
39+
| Nima Trough | | | NIMATRO |
40+
| Mercury ITC | | | MERCURY_ITC |
41+
| SM300-5 (power supply) | | | https://github.com/ISISComputingGroup/IBEX/issues/4461 |
42+
| Tektronix AFG 3000 series | | | TEKAFG3XXX |
43+
| Thurlby EX355P | | | TTIEX355P |
44+
| Thurlby TGA1240 | | | None (hardware is obsolete; functionality to be replaced by Tektronix function generators - we should not need to convert this driver) |
45+
| Thurlby TSX 3510P | all | - | https://github.com/ISISComputingGroup/IBEX/issues/7434 |
46+
| Aladdin-1000 syringe pump | | | ALDN1000 |
47+
| WPI 2XX syringe pump | | | SP2XX |
48+
| `inter galil dio` | | | Digital i/o already covered in GALIL ioc |
49+
| `surf galil dio` | | | Digital i/o already covered in GALIL ioc |
50+
| `delft_dc_mc - front panel.vi` | | | https://github.com/ISISComputingGroup/IBEX/issues/7492 |
51+
| `delft/eltromatdriver` | all | - | https://github.com/ISISComputingGroup/IBEX/issues/7494 |
52+
| `delft/hfcontroldriver` | DELFT, NIMA, "Single Config" | 2011/2012 | Deprecated, not required |
53+
| `hydrocell` | | | One-off user kit; not required |
5454
| ISIS sample environment (digital i/o) | | | https://github.com/ISISComputingGroup/IBEX/issues/7436 |
55-
| Linkam | | | LINKAM95 |
56-
| Newport motor | | | NEWPORT |
57-
| OFFSPEC BH | | | Functionality covered in IBEX by a combination of KEPCO, KHLY2400, and scans library. https://github.com/ISISComputingGroup/IBEX/issues/7435 to write equivalent scans script to existing VI |
58-
| OFFSPEC DELFT RF | | | https://github.com/ISISComputingGroup/IBEX/issues/7493 |
59-
| OFFSPEC high level | | | REFL |
60-
| PI motion stage | | | PIMOT |
61-
| Danfysik | | | DFKPS |
62-
| ITC 503 | | | ITC503 |
55+
| Linkam | | | LINKAM95 |
56+
| Newport motor | | | NEWPORT |
57+
| OFFSPEC BH | | | Functionality covered in IBEX by a combination of KEPCO, KHLY2400, and scans library. https://github.com/ISISComputingGroup/IBEX/issues/7435 to write equivalent scans script to existing VI |
58+
| OFFSPEC DELFT RF | | | https://github.com/ISISComputingGroup/IBEX/issues/7493 |
59+
| OFFSPEC high level | | | REFL |
60+
| PI motion stage | | | PIMOT |
61+
| Danfysik | | | DFKPS |
62+
| ITC 503 | | | ITC503 |
6363

6464
<details>
6565
<summary>Older information:</summary>

doc/spelling_wordlist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ cryo
148148
Cryocon
149149
cryomag
150150
cryomagnet
151+
Cryomagnetics
151152
cryomagnets
152153
cryosms
153154
cset

0 commit comments

Comments
 (0)