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

Conflicts:
	sics/site_ansto/instrument/dingo/dingo_configuration.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl

2015-03-13 15:44:32 +11:00

..

bilby

Make sure that the Lt0 command returns an error if the master_chopper_id isn't set.

2015-02-26 10:51:18 +11:00

config

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

2015-03-13 15:44:32 +11:00

dingo

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

2015-03-13 15:44:32 +11:00

emu

Rename mtth to chom for chopper rotation and set nexus groups.

2015-03-12 10:46:13 +11:00

hipd

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

2015-03-13 15:44:32 +11:00

hrpd

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

2015-03-13 15:44:32 +11:00

kookaburra

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

2015-03-13 15:44:32 +11:00

lyrebird

Allow selecting histogram memory server as source of beam monitor counts.

2015-02-06 08:48:11 +11:00

pas

Let everyone have a magnet sample stick motor.

2014-08-06 10:08:12 +10:00

pelican

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

2015-03-13 15:44:32 +11:00

qld

SICS-151 Remove extraconfig.tcl from remaining MANIFEST.TXT files

2015-01-23 12:28:53 +11:00

reflectometer

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

2015-03-13 15:44:32 +11:00

rsd

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

2015-03-05 13:53:47 +11:00

sans

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

2015-03-13 15:44:32 +11:00

tas

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

2015-03-13 15:44:32 +11:00

TEST_SICS

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

2015-03-05 13:53:47 +11:00

util

Handle nested GROUP and VAR constructs in gen_sct.py

2015-03-13 15:31:56 +11:00

barebones.tcl

Remove superfluous trailing white space from TCL files

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

compareSICS.py

Formatting, typo, and speedup from RELEASE-3_2 compareSICS.py

2014-11-03 11:46:51 +11:00

deploySICS.sh

Strip the date and time from server_date_time in FILEMAP.TXT

2014-09-26 15:33:00 +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

Merge branch 'RELEASE-3_1'

2014-11-13 13:52:46 +11:00

server_config.tcl

Pullback from Taipan 2015-02-19

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