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

site_ansto/instrument/tas/taipan_configuration.tcl

@@ -35,10 +35,16 @@ namespace eval anticollider { proc ::anticollider::init {} {} }
 #fileeval $cfPath(anticollider)/anticollider.tcl
 #fileeval $cfPath(tasmad)/taspub_sics/tasp.tcl
 #fileeval $cfPath(tasmad)/taspub_sics/tasscript.tcl
+
+fileeval $cfPath(environment)/sct_agilent_33220A.tcl
+fileeval $cfPath(environment)/sct_protek_common.tcl
+fileeval $cfPath(environment)/sct_protekmm.tcl
 fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl
 fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
+fileeval $cfPath(environment)/temperature/sct_ls336.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
+fileeval $cfPath(environment)/temperature/sct_ls340.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
 fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl
 fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
@@ -50,6 +56,7 @@ fileeval $cfPath(environment)/temperature/mercury_valve_sct.tcl
 fileeval $cfPath(environment)/temperature/west400.tcl
 fileeval $cfPath(environment)/he3/sct_he3.tcl
 fileeval $cfPath(environment)/magneticField/oxford_labview.tcl
+fileeval $cfPath(environment)/magneticField/sct_oxford12tlv.tcl
 fileeval config/load_setup.tcl
 fileeval log.tcl
 publish logbook spy
@@ -64,6 +71,8 @@ puts "doing tasub"
 MakeTasUB tasub m1 m2 mvfocus mhfocus s1 s2 sgu sgl a1 a2 avfocus ahfocus
 tasub mono dd 3.35416
 tasub ana  dd 3.35416
+# NOTE Autofocussing parameters persist in status.tcl
+# You must set them in extraconfig.tcl to override this behaviour
 tasub mono vb1 102.2
 tasub mono vb2 1.78
 tasub mono hb1 184.42

site_ansto/instrument/tas/util/sics_config.ini

@@ -4,6 +4,9 @@ enabled = False
 [CF1]
 cascade = T1:CF1_ls340,sample_stage:normal_sample_stage
 enabled = False
+[CF4]
+cascade = T1:CF4_ls340,sample_stage:normal_sample_stage
+enabled = False
 [Default]
 cascade = sample_stage:normal_sample_stage
 enabled = True
@@ -105,6 +108,16 @@ terminator = \r\n
 tol1 = 1.0
 tol2 = 1.0
 
+[CF4_ls340]
+desc = "cf4: cryofurnace"
+driver = "ls340"
+imptype = temperature
+ip = 137.157.203.137
+port = 4001
+terminator = \r\n
+tol1 = 1.0
+tol2 = 1.0
+
 [agilent_33220A]
 asyncqueue = sct
 desc = "Function Generator"