SICS-844 Add eulerian cradle configuration to Taipan

2015-01-19 16:08:07 +11:00
parent 06c51416dd
commit a974be9c86
2 changed files with 202 additions and 5 deletions
--- a/site_ansto/instrument/tas/config/motors/euler_configuration.tcl
+++ b/site_ansto/instrument/tas/config/motors/euler_configuration.tcl
@ -0,0 +1,76 @@
+# This must be loaded by motor_configuration.tcl
+
+set ephi_Home 26575217
+#set echi_Home 24224381
+#set echi_Home 8919294
+set echi_Home 24207159
+set eom_Home 23165482
+
+# Sample Lower Tilt sgl -> Euler Chi
+Motor echi $motor_driver_type [params \
+  asyncqueue mc2\
+  axis B\
+  units degrees\
+  hardlowerlim -45\
+  hardupperlim 120\
+  maxSpeed 2\
+  maxAccel 2\
+  maxDecel 2\
+  stepsPerX -25000\
+  absEnc 1\
+  absEncHome $echi_Home\
+  cntsPerX 8192]
+setHomeandRange -motor echi -home 0 -lowrange 10 -uprange 95
+echi softlowerlim -10
+echi softupperlim 120
+echi home 0
+echi speed 1
+echi movecount $move_count
+echi precision 0.01
+echi part sample
+echi long_name euler_chi
+
+# Sample Upper Tilt sgu -> Euler Phi
+Motor ephi $motor_driver_type [params \
+  asyncqueue mc2\
+  axis A\
+  units degrees\
+  hardlowerlim -365\
+  hardupperlim 365\
+  maxSpeed 5\
+  maxAccel 5\
+  maxDecel 5\
+  stepsPerX -12500\
+  absEnc 1\
+  absEncHome $ephi_Home\
+  cntsPerX -4096]
+setHomeandRange -motor ephi -home 0 -lowrange -360 -uprange 360
+ephi softlowerlim -360
+ephi softupperlim 360
+ephi home 0
+ephi speed 3
+ephi movecount $move_count
+ephi precision 0.01
+ephi part sample
+ephi long_name euler_phi
+
+# Sample Upper Translation stu -> euler omega stage
+Motor eom $motor_driver_type [params \
+  asyncqueue mc2\
+  axis C\
+  units degrees\
+  hardlowerlim -45\
+  hardupperlim 80\
+  maxSpeed 2\
+  maxAccel 2\
+  maxDecel 2\
+  stepsPerX 25000\
+  absEnc 1\
+  absEncHome $eom_Home\
+  cntsPerX -8192]
+setHomeandRange -motor eom -home 0 -lowrange 35 -uprange 80
+eom speed 1
+eom movecount $move_count
+eom precision 0.01
+eom part sample
+eom long_name euler_omega
--- a/site_ansto/instrument/tas/util/sics_config.ini
+++ b/site_ansto/instrument/tas/util/sics_config.ini
@ -1,15 +1,24 @@
 [12tmagnet_setup]
-cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,T1:mercury_scpi_01
+cascade = B1:12tmagnet_oxford,sample_stage:12tmagnet_sample_insert,m2s2:normal_m2s2,T1:mercury_01
+enabled = False
+[3He_setup]
+cascade = HE3:he3_both,sample_stage:normal_sample_stage,m2s2:extended_m2s2
 enabled = False
 [CF1]
-cascade = T1:CF1_ls340,sample_stage:normal_sample_stage
+cascade = T1:CF1_ls340,sample_stage:normal_sample_stage,m2s2:normal_m2s2
 enabled = False
 [CF4]
-cascade = T1:CF4_ls340,sample_stage:normal_sample_stage
+cascade = T1:CF4_ls340,sample_stage:normal_sample_stage,m2s2:normal_m2s2
+enabled = False
+[CF7]
+cascade = T1:ls336_08,T2:ls336_05,sample_stage:normal_sample_stage
 enabled = False
 [Default]
-cascade = sample_stage:normal_sample_stage
+cascade = sample_stage:normal_sample_stage,m2s2:normal_m2s2
 enabled = True
+[OC1]
+cascade = T1:OC1_ls340,sample_stage:normal_sample_stage,m2s2:normal_m2s2
+enabled = False
 [B1]
 datype = B
 enabled = False
@ -24,6 +33,13 @@ id = 1
 implementation = none
 name = pulser
 optype = function_generator
+[HE3]
+datype = X
+enabled = False
+id = 1
+implementation = none
+name = he3
+optype = polariser
 [I1]
 datype = I
 enabled = False
@ -38,6 +54,13 @@ id = 2
 implementation = none
 name = curr2
 optype = multimeter
+[P1]
+datype = P
+enabled = False
+id = 1
+implementation = none
+name = pressure1
+optype = pressure
 [T1]
 datype = T
 enabled = False
@ -80,6 +103,11 @@ id = 2
 implementation = none
 name = volts2
 optype = multimeter
+[m2s2]
+enabled = Always
+implementation = normal_m2s2
+name = m2s2
+optype = m2s2_axes
 [sample_stage]
 enabled = Always
 implementation = normal_sample_stage
@ -118,14 +146,84 @@ terminator = \r\n
 tol1 = 1.0
 tol2 = 1.0

+[OC1_ls340]
+desc = "cf1: Orange Cryostat"
+driver = "ls340"
+imptype = temperature
+ip = 10.157.205.41
+port = 4001
+terminator = \r\n
+tol1 = 1.0
+tol2 = 1.0
+
 [agilent_33220A]
 asyncqueue = sct
 desc = "Function Generator"
 driver = agilent_33220A
 imptype = function_generator
 ip = 10.157.205.16
+name = pulser
 port = 5025

+[anv_west6100]
+asyncprotocol = modbus_ap
+desc = "Needle valve West 6100 temperature controller"
+dev_id = 1
+driver = "west_6100"
+imptype = pressure
+ip = 10.157.205.56
+port = 502
+timeout = 2000
+
+[e3200_01]
+asyncprotocol = modbus_ap
+datype = T
+desc = "Eurotherm 3200 (modbus/sct)"
+dev_id = 21
+driver = "eurotherm_3200"
+imptype = temperature
+ip = 10.157.205.58
+port = 502
+tol = 5
+
+[eulerian_cradle]
+desc = "Load the Eulerian cradle configuration"
+imptype = motion_axis
+
+[extended_m2s2]
+desc = "This sets lower speeds and accelerations when the m2 and s2 axes are extended"
+imptype = m2s2_axes
+
+[he3_analyser]
+desc = "3He Analyser"
+driver = "he3_polanal"
+has_anal = true
+has_pol = false
+imptype = polariser
+ip = 10.157.205.2
+port = 55013
+terminator = \r\n
+
+[he3_both]
+desc = "3He Pol+Anal"
+driver = "he3_polanal"
+has_anal = true
+has_pol = true
+imptype = polariser
+ip = 10.157.205.2
+port = 55013
+terminator = \r\n
+
+[he3_polariser]
+desc = "3He Polariser"
+driver = "he3_polanal"
+has_anal = false
+has_pol = true
+imptype = polariser
+ip = 10.157.205.2
+port = 55013
+terminator = \r\n
+
 [ls336_01]
 asyncqueue = sct
 desc = "Lakeshore 336 temperature controller"
@ -164,7 +262,7 @@ asyncqueue = sct
 desc = "Lakeshore 336 temperature controller"
 driver = "ls336"
 imptype = temperature
-ip = 137.157.201.21
+ip = 10.157.205.54
 port = 7777
 terminator = \r\n
 tol1 = 1.0
@ -181,6 +279,17 @@ terminator = \r\n
 tol1 = 1.0
 tol2 = 1.0

+[ls336_08]
+asyncqueue = sct
+desc = "Lakeshore 336 temperature controller"
+driver = "ls336"
+imptype = temperature
+ip = 10.157.205.55
+port = 7777
+terminator = \r\n
+tol1 = 1.0
+tol2 = 1.0
+
 [ls336_11]
 desc = "Lakeshore 336 temperature controller"
 driver = "ls336"
@ -234,6 +343,14 @@ terminator = \r\n
 tol1 = 1.0
 tol2 = 1.0

+[ls370_1]
+desc = "Lakeshore 370 Resistance Bridge"
+driver = "lakeshore_m370"
+imptype = temperature
+ip = 10.157.205.42
+port = 4001
+tol = 1.0
+
 [mercury_01]
 assoc = 00000124
 cards = HHHVLTTP
@ -273,6 +390,10 @@ terminator = \n
 ttol = 1.0
 vtol = 5

+[normal_m2s2]
+desc = "This sets speed and acceleration for the default extension of the m2 and s2 axes"
+imptype = m2s2_axes
+
 [normal_sample_stage]
 desc = "This is the default sample stage configuration"
 imptype = motion_axis