From 6ff638b36ebc55bdf1dca574546871af3c67d292 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Wed, 8 Oct 2014 19:36:35 +1100 Subject: [PATCH] SICS-793: Bring GIT up to date with changes made on ics1-taipan --- site_ansto/instrument/tas/taipan_configuration.tcl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/site_ansto/instrument/tas/taipan_configuration.tcl b/site_ansto/instrument/tas/taipan_configuration.tcl index 189815c0..84bf3fc0 100644 --- a/site_ansto/instrument/tas/taipan_configuration.tcl +++ b/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/sct_mercury_valve.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