Douglas Clowes 106d61a883 Merge branch 'Taipan_R31' into temp ...

Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
	sics/site_ansto/instrument/tas/util/sics_config.ini

2015-02-19 14:50:39 +11:00

..

config

Tilt configuration from Taipan 2015-02-19

2015-02-19 10:35:21 +11:00

DMC2280

Fix Typos

2012-11-15 17:22:01 +11:00

script_validator

updated Taipan

2012-11-15 17:07:16 +11:00

util

Pullback from Taipan 2015-02-19

2015-02-19 10:34:12 +11:00

hostport_config_test.tcl

Skip mc5 socket for taipan mc6 test addresses

2013-06-27 16:43:07 +10:00

hostport_config.tcl

Use the right host address for counters on Taipan.

2013-05-17 07:36:30 +10:00

Makefile

updated Taipan

2012-11-15 17:07:16 +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

updated Taipan

2012-11-15 17:07:16 +11:00

sics_ports.tcl

updated Taipan

2012-11-15 17:07:16 +11:00

sics_simulation.tcl

Break simulation flagss out of the server_config.tcl

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

taipan_configuration.tcl

Pullback from Taipan 2015-02-19

2015-02-19 10:34:12 +11:00

tas.hdd

Add a header template file

2012-11-15 17:26:57 +11:00