Douglas Clowes d698c302fd Merge branch 'RELEASE-3_1' into temp ...

Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/julabo_lh45.sct
	sics/site_ansto/instrument/util/config_edit.py
	sics/site_ansto/instrument/util/gen_sct.py

2014-07-16 12:56:40 +10:00

..

bilby

Make all sct drivers.

2014-07-15 10:56:27 +10:00

config

Save 5T magnet sensor reading and setpoint.

2014-07-16 11:27:13 +10:00

dingo

Change Dingo stth for multi-turn rotary encoder

2014-07-09 15:02:24 +10:00

hipd

Use V1 with I1 for autolab setup on wombat

2014-07-16 09:28:26 +10:00

hrpd

Absolute encoders/resolvers changed on PCX, PCR and MOM on Echidna

2014-06-27 14:28:28 +10:00

kookaburra

Pull back changes in Kookaburra config

2014-07-07 14:48:12 +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

Pelican merge: pelican_configuration.tcl, motor_configuration.tcl

2014-06-26 15:15: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

Update 5T magnet driver name in Quokka sics_config.ini

2014-07-16 10:11:37 +10:00

tas

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

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

TEST_SICS

Merge branch 'RELEASE-3_1' into temp

2014-07-16 12:56:40 +10:00

util

Don't copy 'id' from the option section into the implementation section.

2014-07-15 08:59:16 +10:00

barebones.tcl

Remove superfluous trailing white space from TCL files

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

compareSICS.py

Reindent *.py with reindent.py

2014-07-04 11:28:11 +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

Implement hlistprop $path tclnames

2014-07-02 12:28:41 +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

Reindent *.py with reindent.py

2014-07-04 11:28:11 +10:00

server_config.tcl

Add ServerOption LoggerDir as the data directory

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