Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/Glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ A system to record PV values and reinstate them on startup of an IOC.

## [Axis](/specific_iocs/motor_extensions/Axis)

In IBEX, the term axis refers to a degree-of-freedom within an experimental system. See [Axes in IBEX](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/Glossary/Axes%20in%20IBEX%20V1R0M0.pdf) for more detail.
In IBEX, the term axis refers to a degree-of-freedom within an experimental system. See [Axes in IBEX](https://stfc365.sharepoint.com/sites/IBEXSAG/Shared%20Documents/Forms/AllItems.aspx?id=%2Fsites%2FIBEXSAG%2FShared%20Documents%2FAxes%20in%20IBEX%20V1R0M0%2Epdf&parent=%2Fsites%2FIBEXSAG%2FShared%20Documents) for more detail.

## Backdoor

Expand Down
2 changes: 1 addition & 1 deletion doc/client/misc/Designing-for-Colour-Blindness.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This page provides some tips on designing displays that are suitable for people
1. Don't rely on colour alone to distinguish between elements of the display. Combine colours with different shapes (with outlines, in black, say) or text.
1. In graphs, combine colours with line styles (solid lines, dashed lines, alternative dots-dashes, etc.).
1. Avoid colour combinations that colour-blind people find difficult to distinguish.
1. [Colour Combinations](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/Colour_Combinations.pptx) illustrates some poor and some good colour combinations.
1. [Colour Combinations](https://stfc365.sharepoint.com/:p:/r/sites/ISISExperimentControls/ICP%20Discussions/Colour_Combinations.pptx?d=w29a6418cd1da43ee94002e06267c7df4&csf=1&web=1&e=gwfSBH) illustrates some poor and some good colour combinations.
1. As a simple rule (for red-green colour blindness): replace red with magenta or green with turquoise.
1. Download the [ColorOracle](http://colororacle.org/index.html) tool. It temporarily changes the colour balance of your screen to show how it appears to a colour blind person. Use it when designing displays & graphs. NOTE: when running the ColorOracle exe file, a small icon will appear on your taskbar (next to the date and time); if it's not there, check your hidden icons.
1. The [ColorOracle](http://colororacle.org/design.html) site has more comprehensive design advice.
10 changes: 5 additions & 5 deletions doc/overview/Links-and-Resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

## Training material

- [IBEX Training Material](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/Forms/AllItems.aspx?RootFolder=%2Fisis%2Fcomputing%2FICPdiscussions%2FTraining&FolderCTID=0x01200027AD8F05966A2748B3B04C98BB5B442B&View={F2C33C51-70E6-4343-B937-2C59A2568306})
- [IBEX Training Material](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/Forms/AllItems.aspx?id=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FTraining&viewid=45d81cb9%2D9571%2D4a80%2Da5cc%2D2cb4871703a3)

- There is a settings branch called NDXTRAIN with the setup for the training PCs (excluding machine specific files)

- [IBEX scripting and Configuration Workshop slide](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/IBEX%20Scripting%20and%20Configurations%20Workshop.pptx)
- [IBEX scripting and Configuration Workshop slide](https://stfc365.sharepoint.com/:p:/r/sites/ISISExperimentControls/ICP%20Discussions/IBEX%20Scripting%20and%20Configurations%20Workshop.pptx?d=wa827b6c1ff6b48db978ddb3e3c695ce8&csf=1&web=1&e=lioSaC)

- [IBEX general intro slides (work in progress)](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/IBEX_Update.pptx)
- [IBEX general intro slides (work in progress)](https://stfc365.sharepoint.com/:p:/r/sites/ISISExperimentControls/ICP%20Discussions/IBEX_Update.pptx?d=w9caf2dc7223f4bcb8b3fffe950f043a5&csf=1&web=1&e=HdEFu7)

- [Sharepoint discussion site](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions)
- [Sharepoint discussion site](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/Forms/AllItems.aspx?viewid=45d81cb9%2D9571%2D4a80%2Da5cc%2D2cb4871703a3)

- [Instrument sharepoint site](http://www.facilities.rl.ac.uk/isis/computing/instruments/Instrument%20Documents/Forms/AllItems.aspx) contains passwords and instrument definition
- [Instrument sharepoint site](https://stfc365.sharepoint.com/sites/ISISExperimentControls/Instrument%20Documents/Forms/AllItems.aspx) contains passwords and instrument definition

- [EPICS Channel access explained](http://www.aps.anl.gov/epics/docs/CAproto.html)
- [EPICS Channel access explained 2 (presentation)](https://epics.anl.gov/docs/APS2014/08-Database-Principles.pdf): nice bit on `NMS`, `MS`, `MSS`, `MSI`
Expand Down
4 changes: 2 additions & 2 deletions doc/overview/New-Starters.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ These can be found in `C:\Instrument\Apps\EPICS`.

### Office Admin Links

As a new starter you should add your name and picture to the training [slides](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/Forms/AllItems.aspx?RootFolder=%2Fisis%2Fcomputing%2FICPdiscussions%2FTraining&FolderCTID=0x01200027AD8F05966A2748B3B04C98BB5B442B&View=%7BF2C33C51-70E6-4343-B937-2C59A2568306%7D).
As a new starter you should add your name and picture to the training slides in `<shares>\ISIS_Experiment_Controls_Public\training`. If you do not know where this share is, please ask.

- [ISIS Sharepoint](https://stfc365.sharepoint.com/sites/isis-hub/) - Shared ISIS documents, manuals, meeting minutes etc
- [Oracle Login](https://portal.ssc.rcuk.ac.uk/) - Book leave, create timesheets
Expand Down Expand Up @@ -89,7 +89,7 @@ Ironically, to get a well-explained overview of what IBEX is, and how to interac

There are some training materials available that we use to train scientists on IBEX, which is also a nice way to get started:

- [IBEX training](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/Forms/AllItems.aspx?RootFolder=%2Fisis%2Fcomputing%2FICPdiscussions%2FTraining&FolderCTID=0x01200027AD8F05966A2748B3B04C98BB5B442B&View=%7BF2C33C51-70E6-4343-B937-2C59A2568306%7D)
- IBEX training: `<shares>\ISIS_Experiment_Controls_Public\training` (if you do not know where the share is, please ask)

### Components and Technical Concepts

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@ This information is left here for completeness only.
> The ``-XX:+UnlockCommercialFeatures`` command line option is **not** a feature of either batch file. Given that the Apache SF is dedicated to the provision of open-source software, it seems highly unlikely that they will ever use
> the ``-XX:+UnlockCommercialFeatures`` command line option.
> ## Reference Material
> * [Java Licensing](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/Forms/AllItems.aspx?RootFolder=%2Fisis%2Fcomputing%2FICPdiscussions%2FJava%20Licensing&FolderCTID=0x01200027AD8F05966A2748B3B04C98BB5B442B&View={F2C33C51-70E6-4343-B937-2C59A2568306}) folder on ICP Discussions site.
> * [Java Licensing](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/Forms/AllItems.aspx?id=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FJava%20Licensing) folder on ICP Discussions site.
> * [Oracle Binary Code License Agreement for the JAVA SE Platform Products (02-April-2013)](http://www.oracle.com/technetwork/java/javase/documentation/otn-bcl-02april2013-1966219.pdf)
> * [Ticket: #1915](https://github.com/ISISComputingGroup/IBEX/issues/1915)
6 changes: 3 additions & 3 deletions doc/processes/instrument_details/ALF-Instrument-Details.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ DAE-2
{#alf_noteGalil}
##### Note: Galil #####
Model: [DMC2280](http://www.galilmc.com/products/dmc-22x0.php).<br>
Photograph of [ALF Galil Crate](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/ALF/ALF_Galil_Crate.jpg).<br>
Photograph of [ALF Galil Crate](https://stfc365.sharepoint.com/:i:/r/sites/ISISExperimentControls/ICP%20Discussions/ALF/ALF_Galil_Crate.jpg?csf=1&web=1&e=tteUae).<br>
Note that GALIL_02 had trouble communicating asynchronously so Freddie switched it to synchronous (done by making the third argument of `GalilCreateController("Galil", "$(GALILADDR02)", 20)` negative in `galil2.cmd`).

{#alf_noteJaws}
##### Note: Jaws #####
Location: various<br>
Driven by [Galils](#alf_noteGalil).<br>
Photograph of [ALF Slits/Jaws](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/ALF/ALF_Slits.jpg).
Photograph of [ALF Slits/Jaws](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/Forms/AllItems.aspx?id=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FALF%2FALF%5FSlits%2Ejpg&viewid=45d81cb9%2D9571%2D4a80%2Da5cc%2D2cb4871703a3&parent=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FALF).

{#alf_noteGoniometer}
##### Note: Goniometer #####
Model: 6-axis Goniometer, unknown model & manufacturer.<br>
Driven by [Galils](#alf_noteGalil).<br>
See [ALF Goniometer Axes](/specific_iocs/motor_extensions/ALF-Goniometer-Axes) for details of how the Goniometer is set up and configured.<br>
Photographs of [ALF Goniometer (1)](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/ALF/ALF_Goniometer_1.jpg) and [ALF Goniometer (2)](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/ALF/ALF_Goniometer_2.jpg).
Photographs of [ALF Goniometer (1)](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/Forms/AllItems.aspx?id=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FALF%2FALF%5FGoniometer%5F1%2Ejpg&viewid=45d81cb9%2D9571%2D4a80%2Da5cc%2D2cb4871703a3&parent=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FALF) and [ALF Goniometer (2)](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/Forms/AllItems.aspx?id=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FALF%2FALF%5FGoniometer%5F2%2Ejpg&viewid=45d81cb9%2D9571%2D4a80%2Da5cc%2D2cb4871703a3&parent=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FALF).
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Agilent has spun-off its electronic measurement business, which now trades as [K
{#chipir_note-super-logics}
##### Note: SuperLogics #####
1. [8017/18/19 series - 8 Channel Analog Input Module, 16-Bit A/D Converter](https://www.superlogics.com/data-acquisition-99/data-acq-analog-input/analog-input-rs485/8017.html).<br>
Copy of manual for [8017/18/19 series](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/Chipir/Manuals%20for%20Equipment/Superlogics_8019R.pdf).
Copy of manual for [8017/18/19 series](https://stfc365.sharepoint.com/:b:/r/sites/ISISExperimentControls/ICP%20Discussions/Chipir/Manuals%20for%20Equipment/Superlogics_8019R.pdf?csf=1&web=1&e=EV4XiD).

{#chipir_note-camera}
##### Note: Camera #####
Expand Down
4 changes: 2 additions & 2 deletions doc/processes/instrument_details/CRISP-Instrument-Details.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ TPG300 support is implemented via [#216](https://github.com/ISISComputingGroup/I

{#crisp_noteEurotherm}
##### Note: Eurotherm #####
[Eurotherms](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/CRISP/CRISP_Eurotherms.jpg) are used to control temperature Orange Cryostat, CCR and Furnace devices.
Eurotherms are used to control temperature Orange Cryostat, CCR and Furnace devices.

{#crisp_noteOxfordInstruments}
##### Note: Oxford Instruments #####
Expand All @@ -66,7 +66,7 @@ TPG300 support is implemented via [#216](https://github.com/ISISComputingGroup/I

{#crisp_noteCCR}
##### Note: Closed Cycle Refrigerators #####
1. [CCR](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/CRISP/CRISP_CCR.jpg) is the most frequently used low-temperature device used in on CRISP.
1. CCR is the most frequently used low-temperature device used in on CRISP.
[CCRs](https://www.isis.stfc.ac.uk/Pages/Closed-Cycle-refrigerators,-CCRs.aspx). Not directly computer-controlled - controlled via Eurotherm.

{#crisp_noteWaterBath}
Expand Down
22 changes: 11 additions & 11 deletions doc/processes/instrument_details/EMMA-Instrument-Details.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,23 @@ One T0 chopper.<br>
Chopper is ISIS Mk2 chopper. Mk2 choppers have a serial interface (not Ethernet like Mk3).
See [#2130](https://github.com/ISISComputingGroup/IBEX/issues/2130) for IOC & OPI for Mk2 chopper.<br>
The front panel of the Mk2 chopper control crate (located in the EMMA rack) looks like this:
* [wide angle view](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA_T0_Chopper_Front_Panel_(wide)_2017_06_05.jpg)
* [zoomed-in view](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA_T0_Chopper_Front_Panel_(zoom)_2017_06_05.jpg)
* [wide angle view](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/Forms/AllItems.aspx?id=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FEMMA%2FEMMA%5FT0%5FChopper%5FFront%5FPanel%5F%28wide%29%5F2017%5F06%5F05%2Ejpg&viewid=45d81cb9%2D9571%2D4a80%2Da5cc%2D2cb4871703a3&parent=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FEMMA)
* [zoomed-in view](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/Forms/AllItems.aspx?id=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FEMMA%2FEMMA%5FT0%5FChopper%5FFront%5FPanel%5F%28zoom%29%5F2017%5F06%5F05%2Ejpg&viewid=45d81cb9%2D9571%2D4a80%2Da5cc%2D2cb4871703a3&parent=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FEMMA)

{#emma_noteFermiChopper}
##### Note: Fermi Chopper #####
EMMA has a single Fermi chopper (manufactured by SKF).<br>
Link to [Manual](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/Mirrortron-SKF%20892-0053%20MB350PC_R%20Rev%20C.pdf)<br>
Link to [Manual](https://stfc365.sharepoint.com/:b:/r/sites/ISISExperimentControls/ICP%20Discussions/EMMA/Mirrortron-SKF%20892-0053%20MB350PC_R%20Rev%20C.pdf?csf=1&web=1&e=hctyNH)<br>
The Fermi chopper control crates (located in the EMMA rack) look like this:
* [Front View (upper & lower crates)](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA_SKF_FermiChopper_Controller_Front_Upper_Lower_2017_06_05.jpg)
* [Rear View (upper crate)](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA_SKF_FermiChopper_Controller_Rear_Upper_2017_06_05.jpg)
* [Rear View (lower crate)](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA_SKF_FermiChopper_Controller_Rear_Lower_2017_06_05.jpg)
* [Front View (upper & lower crates)](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/Forms/AllItems.aspx?id=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FEMMA%2FEMMA%5FSKF%5FFermiChopper%5FController%5FFront%5FUpper%5FLower%5F2017%5F06%5F05%2Ejpg&viewid=45d81cb9%2D9571%2D4a80%2Da5cc%2D2cb4871703a3&parent=%2Fsites%2FISISExperimentControls%2FICP%20Discussions%2FEMMA)
* [Rear View (upper crate)](https://stfc365.sharepoint.com/:i:/r/sites/ISISExperimentControls/ICP%20Discussions/EMMA/EMMA_SKF_FermiChopper_Controller_Rear_Upper_2017_06_05.jpg?csf=1&web=1&e=GzrImg)
* [Rear View (lower crate)](https://stfc365.sharepoint.com/:i:/r/sites/ISISExperimentControls/ICP%20Discussions/EMMA/EMMA_SKF_FermiChopper_Controller_Rear_Lower_2017_06_05.jpg?csf=1&web=1&e=qJrYiI)

{#emma_noteFermiChopperLift}
##### Note: Fermi Chopper Lift #####
The Fermi chopper is lifted into position by a Galil controlled motor.<br>
The Fermi chopper must not be operated when it is not in the beam (i.e. in the parked/upper position)
There is a hardware interlock to prevent the Fermi chopper from being operated in the parked position. This interlock is implemented in the Galil controller, via a Galil program (described in the [EMMA chopper lifter - Handover](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA%20chopper%20lifter%20-%20Handover.docx) document). In SECI a simple VI is used to provide a GUI, which passes parameters to the Galil program, so that the user can control the Fermi Chopper lift. IBEX should provide a similar capability via an IOC and OPI.
There is a hardware interlock to prevent the Fermi chopper from being operated in the parked position. This interlock is implemented in the Galil controller, via a Galil program (described in the [EMMA chopper lifter - Handover](https://stfc365.sharepoint.com/:w:/r/sites/ISISExperimentControls/ICP%20Discussions/EMMA/EMMA%20chopper%20lifter%20-%20Handover.docx?d=wafc19324e3354636b5ab702a140668aa&csf=1&web=1&e=A6BnDe) document). In SECI a simple VI is used to provide a GUI, which passes parameters to the Galil program, so that the user can control the Fermi Chopper lift. IBEX should provide a similar capability via an IOC and OPI.

{#emma_noteJaws}
##### Note: Jaws #####
Expand All @@ -76,23 +76,23 @@ Jaw set is manufactured by Advanced Design Consultancy.

{#emma_noteVacuum}
##### Note: Vacuum System #####
The vacuum system ([TPG300](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA_TPG300_2017_06_05.jpg)) on EMMA is currently (06/03/2017) not operational. Outside possibility that it may be operational by cycle 2017/02.
The vacuum system ([TPG300](https://stfc365.sharepoint.com/:i:/r/sites/ISISExperimentControls/ICP%20Discussions/EMMA/EMMA_TPG300_2017_06_05.jpg?csf=1&web=1&e=k6q5ew)) on EMMA is currently (06/03/2017) not operational. Outside possibility that it may be operational by cycle 2017/02.

{#emma_noteYZTable}
##### Note: Y-Z Table #####
Driven by Galil controlled motors.
In SECI, Y-Z Table has its own GUI. No particular reason for this; it could be merged with the Rotation Stage UI.<br>
[Photograph of Y-Z table](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA_Y_Z_Table_2017_06_05.jpg).
[Photograph of Y-Z table](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/EMMA/EMMA_Y_Z_Table_2017_06_05.jpg).

{#emma_noteRotationStage}
##### Note: Rotation Stage #####
Driven by Galil controlled motors.
In SECI, Rotation Stage has its own GUI. No particular reason for this; it could be merged with the Y-Z Table UI.<br>
[Photograph of Rotation Stage](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA_Rotation_Stage_2017_06_05.jpg). It sits on top of the Y-Z table when in use.
[Photograph of Rotation Stage](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/EMMA/EMMA_Rotation_Stage_2017_06_05.jpg). It sits on top of the Y-Z table when in use.

{#emma_noteCAENHT}
##### Note: CAEN HT #####
CAEN high-voltage system is a [SYS2527](http://www.facilities.rl.ac.uk/isis/computing/ICPdiscussions/EMMA/EMMA_CAEN_HV_PSU_2017_06_05.jpg) (see tickets: #212, #241, #320, #419, #424)
CAEN high-voltage system is a [SYS2527](https://stfc365.sharepoint.com/sites/ISISExperimentControls/ICP%20Discussions/EMMA/EMMA_CAEN_HV_PSU_2017_06_05.jpg) (see tickets: #212, #241, #320, #419, #424)

{#emma_noteCAENDigitiser}
##### Note: CAEN Digitiser #####
Expand Down
Loading