Douglas Clowes 648c8003b7 Merge from Wombat, except sics_config.ini ...

Conflicts:
	sics/site_ansto/instrument/config/environment/magneticField/sct_green_magnet.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/hmm/hmm_object.tcl
	sics/site_ansto/instrument/hipd/config/commands/eulerscan.tcl
	sics/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/hipd/util/sics_config.ini
	sics/site_ansto/instrument/server_config.tcl

2014-06-25 13:35:28 +10:00

..

bilby

Use the new make_vmot command to make a virtual motor has the same klass as the real motor it is chained to.

2014-06-23 10:29:18 +10:00

config

Merge from Wombat hmm_object.tcl

2014-06-25 13:22:44 +10:00

dingo

Remove superfluous trailing white space from TCL files

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

hipd

Merge from Wombat, except sics_config.ini

2014-06-25 13:35:28 +10:00

hrpd

Sort the *.ini files so we can better compare them

2014-06-24 17:22:46 +10:00

kookaburra

Remove superfluous trailing white space from TCL files

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

lyrebird

Remove superfluous trailing white space from TCL files

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

pas

Remove superfluous trailing white space from TCL files

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

pelican

Remove superfluous trailing white space from TCL files

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

qld

Remove superfluous trailing white space from TCL files

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

reflectometer

Pull back Platypus Command changes

2014-06-24 12:36:53 +10:00

rsd

Sort the *.ini files so we can better compare them

2014-06-24 17:22:46 +10:00

sans

Add the huber bath Pilot ONE driver

2014-06-17 14:53:48 +10:00

tas

Sort the *.ini files so we can better compare them

2014-06-24 17:22:46 +10:00

TEST_SICS

Trivial changes to unit test

2014-06-23 12:48:46 +10:00

util

Added command to make virtual motor which hdbchains to a real motor.

2014-06-23 10:29:17 +10:00

barebones.tcl

Remove superfluous trailing white space from TCL files

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

compareSICS.py

Minor fixes to compareSICS, gitrefer and gitloader

2014-06-05 16:35:49 +10:00

deploySICS.sh

Deploy all environment drivers to all instruments.

2014-05-16 13:56:51 +10:00

gen_home_slits.tcl

Restored accidentally removed file.

2012-11-15 12:51:16 +11:00

genCLOSLOOP.tcl

Restored accidentally removed file.

2012-11-15 12:51:16 +11:00

gumxml.tcl

Catch errors in the hval/hget and return the message as the value

2014-05-26 12:55:34 +10:00

MANIFEST.TXT

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

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

mksim_config.tcl

Remove superfluous trailing white space from TCL files

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

runsics.py

Remove superfluous trailing white space from Python files

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

server_config.tcl

Add ServerOption LoggerDir as the data directory

2014-06-24 12:28:14 +10:00