Douglas Clowes 3ce5ae0977 Merge branch 'RELEASE-3_1' ...

Conflicts:
	sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py

2014-11-06 14:13:20 +11:00

..

config

Merge branch 'RELEASE-3_1'

2014-11-06 14:13:20 +11:00

DMC2280

init config for kookaburra

2012-11-15 17:25:06 +11:00

util

Load available environment controller configurations for Kookaburra.

2014-10-17 16:42:56 +11:00

hostport_config_test.tcl

SICS-587 Setup hostport dictionary based configuration for Kookaburra

2013-06-21 08:40:54 +10:00

hostport_config.tcl

Kookaburra local changes

2014-09-09 16:50:08 +10:00

kookaburra_configuration.tcl

Merge branch 'RELEASE-3_1'

2014-11-06 14:13:20 +11:00

Makefile

init config for kookaburra

2012-11-15 17:25:06 +11:00

MANIFEST.TXT

Add sics_simulation.tcl to each instrument MANIFEST.TXT file

2014-09-10 10:14:46 +10:00

runsics_def.py

A new runsics script has been implemented in python (runsics.py).

2013-05-13 23:11:15 +10:00

script_validator_ports.tcl

init config for kookaburra

2012-11-15 17:25:06 +11:00

sics_ports.tcl

init config for kookaburra

2012-11-15 17:25:06 +11:00

sics_simulation.tcl

Break simulation flagss out of the server_config.tcl

2014-09-09 15:14:57 +10:00