Douglas Clowes c3bb4a9591 Merge branch 'RELEASE-3_1' into RELEASE-3_2 ...

Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl

2015-01-07 13:09:27 +11:00

..

anticollider

SICS-608: Implemented detector protection using anticollider using a voltage limit of 56 volts.

2014-09-30 15:12:41 +10:00

chopper

Merge branch 'RELEASE-3_1' into RELEASE-3_2

2015-01-07 13:09:27 +11:00

commands

Fix beamstop targets in Bilby selbs command.

2014-09-10 15:01:24 +10:00

counter

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

hipadaba

Initial bilby configuration.

2014-01-15 16:31:14 +11:00

hmm

Set upperlimits to 1800V on dhv1 and dhv2 for Bilby detector voltages.

2014-09-30 15:12:42 +10:00

motors

Merge branch 'RELEASE-3_1' into RELEASE-3_2

2015-01-07 13:09:27 +11:00

nexus

Initial bilby configuration.

2014-01-15 16:31:14 +11:00

optics

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

parameters

Add variables for Bilby beamcenter position and selected beamstop.

2014-09-10 15:01:26 +10:00

plc

Remove superfluous trailing white space from TCL files

2014-05-16 17:23:58 +10:00

scan

Initial bilby configuration.

2014-01-15 16:31:14 +11:00

INSTCFCOMMON.TXT

Merge branch 'RELEASE-3_1' into RELEASE-3_2

2014-08-06 13:53:18 +10:00