Pullback from Taipan 2015-02-19

site_ansto/instrument/tas/taipan_configuration.tcl

@@ -35,21 +35,27 @@ 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_eurotherm_3200.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_lakeshore_m370.tcl
 fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl
 fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
-fileeval $cfPath(environment)/temperature/sct_mercury_base.tcl
-fileeval $cfPath(environment)/temperature/sct_mercury_temp.tcl
-fileeval $cfPath(environment)/temperature/sct_mercury_pres.tcl
-fileeval $cfPath(environment)/temperature/sct_mercury_level.tcl
-fileeval $cfPath(environment)/temperature/sct_mercury_valve.tcl
 fileeval $cfPath(environment)/temperature/west400.tcl
+fileeval $cfPath(environment)/temperature/sct_west_6100.tcl
 fileeval $cfPath(environment)/he3/sct_he3.tcl
 fileeval $cfPath(environment)/magneticField/oxford_labview.tcl
+fileeval $cfPath(environment)/magneticField/sct_oxford12tlv.tcl
+fileeval $cfPath(beamline)/sct_he3_polanal.tcl
 fileeval config/load_setup.tcl
 fileeval log.tcl
 publish logbook spy
@@ -58,12 +64,44 @@ source gumxml.tcl
 ::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
 ::anticollider::protect_detector "true"
 
+if { [ dict exists $::config_dict sample_stage implementation ] } {
+  set sample_stage [ dict get $::config_dict sample_stage implementation ]
+} else {
+  set sample_stage "normal_sample_stage"
+}
+switch $sample_stage {
+  "eulerian_cradle" {
+  # s1-> eom, sgu -> ephi, sgl -> echi
+    set OMEGA s1
+    set PHI ephi
+    set CHI echi
+  }
+  "normal_sample_stage" - default {
+    set OMEGA s1
+    set PHI sgu
+    set CHI sgl
+  }
+}
 # init for the tasUB
 #make mcv mch acv ach into mvfocus mhfocus avfocus ahfocus when it works
 puts "doing tasub"
-MakeTasUB tasub m1 m2 mcv mch s1 s2 sgu sgl a1 a2 acv ach
+MakeTasUB tasub m1 m2 mvfocus mhfocus $OMEGA s2 $PHI $CHI a1 a2 avfocus ahfocus
 tasub mono dd 3.35416
 tasub ana  dd 3.35416
+# NOTE Autofocussing parameters (vbn, hbn) persist in status.tcl
+# To override this behaviour you can set them in extraconfig.tcl
+tasub mono vb1 102.2
+tasub mono vb2 1.78
+tasub mono hb1 18.28
+tasub mono hb2 60.1
+tasub mono hb3 0.951
+tasub ana  vb1 115
+tasub ana  vb2 2.13
+tasub ana  hb1 45.68
+tasub ana  hb2 105.7
+tasub ana  hb3 0.945
+tasub focusfn energy
+tasub autofocus 0
 tasub updatetargets
 puts "done tasub"
 
@@ -74,6 +112,16 @@ server_init
 ###########################################
 # WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
 
+puts "Making hkl command"
+MakeMono mono PG m1 m2
+mono dd 3.35416
+MakeWaveLength lambda mono
+MakeEnergy energy mono
+#MakeSingleX singlex
+#MakeHKL s2 $OMEGA $PHI $CHI
+#MakeHKLMot hkl
+#MakeUBcalc ubcalc hkl
+
 # Provide tasmot notifications to GumTree when real motors move
 proc m2tasupdate {} {
   tasub update
@@ -109,7 +157,7 @@ proc a2tasupdate {} {
 publish a2tasupdate user
 
 scriptcallback connect m2 MOTEND m2tasupdate
-scriptcallback connect s1 MOTEND s1s2tasupdate
+scriptcallback connect $OMEGA MOTEND s1s2tasupdate
 scriptcallback connect s2 MOTEND s1s2tasupdate
 scriptcallback connect a2 MOTEND a2tasupdate