Add new sics_config.ini for Taipan

TODO SICS-779 Changing sample_stage to 12tmagnet_sample_insert doesn't work.

site_ansto/instrument/tas/config/motors/motor_configuration.tcl

@@ -4,9 +4,6 @@
 # FastShutter is currently set on Quokka only
 #::utility::mkVar FastShutter text manager FastShutter false instrument true false
 
-# SET TO 1 TO USE THE TILT STAGE ie sample phi and chi
-set use_tiltstage 0
-
 set animal taipan
 set sim_mode [SplitReply [motor_simulation]]
 
@@ -93,6 +90,40 @@ set move_count 100
 ############################
 #
 
+# CHOOSE HERE for sample stage configuration
+##########################################
+# Set axis_config as follows to use different axis configurations
+# 0: normal stage configuration
+# 1: Oxford magnet sample stick
+set axis_config 0
+
+if { [ info exists ::config_dict ] } {
+  if { [ dict exists $::config_dict sample_stage implementation ] } {
+    set implementation [ dict get $::config_dict sample_stage implementation ]
+    if {$implementation == "normal_sample_stage"} {
+      set axis_config 0
+    } elseif {$implementation == "12tmagnet_sample_insert"} {
+      set axis_config 1
+    } else {
+      set axis_config 0
+    }
+  }
+}
+
+switch $axis_config {
+  0 {
+    set use_normal_config "true"
+  }
+  1 {
+    set magmot "ms1"
+    set magmot_aq "mc2"
+    set magmot_axis "A"
+    set use_normal_config "false"
+    fileeval $cfPath(motors)/magnet_configuration.tcl
+  }
+}
+
+
 # Dummy translation motor, useful for testing scans
 
 Motor dummy_motor asim [params \
@@ -138,36 +169,6 @@ dummy_s1 softupperlim 180
 dummy_s1 precision 0.02
 dummy_s1 home 0
 
-if { [ info exists ::config_dict ] && [ dict get $::config_dict s1_sample_insert enabled ] } {
-  set samp_stage_name "s1ss"
-  set tilt_motor_driver_type asim
-
-  Motor s1 $motor_driver_type [params \
-    asyncqueue mc2\
-    host mc2-taipan\
-    port pmc2-taipan\
-    axis A\
-    units degrees\
-    hardlowerlim -1440\
-    hardupperlim 1440\
-    maxSpeed 1\
-    maxAccel 1\
-    maxDecel 1\
-    stepsPerX [expr 67.0 * 25000 / 360]\
-    absEnc 1\
-    absEncHome 31275743\
-    cntsPerX [expr 67.0 * 8192 / 360]]
-  s1 part sample
-  s1 long_name s1
-  s1 softlowerlim -180
-  s1 softupperlim 180
-  s1 home 0
-} else {
-  set samp_stage_name "s1"
-  set tilt_motor_driver_type $motor_driver_type
-}
-
-#if $use_tiltstage {
 # mc1: Monochromator crystal selection rotation/Tilt
 Motor mtilt $motor_driver_type [params \
   asyncqueue mc1\
@@ -189,9 +190,7 @@ mtilt long_name mtilt
 mtilt softlowerlim -5
 mtilt softupperlim 5
 mtilt home 0
-#}
 
-set atest mtilt
 
 # mc1: Monochromator Linear (Translate)
 Motor mtrans $motor_driver_type [params \
@@ -384,27 +383,29 @@ stl home 0.0
 stl backlash_offset -0.2
 
 # mc2: Sample Rotate
-Motor $samp_stage_name $motor_driver_type [params \
-  asyncqueue mc2\
-  host mc2-taipan\
-  port pmc2-taipan\
-  axis E\
-  units degrees\
-  hardlowerlim -194\
-  hardupperlim 134\
-  maxSpeed 4\
-  maxAccel 2\
-  maxDecel 2\
-  stepsPerX 12495\
-  absEnc 1\
-  absEncHome 10695068\
-  cntsPerX 4096]
-$samp_stage_name part sample
-$samp_stage_name long_name $samp_stage_name
-$samp_stage_name softlowerlim -170
-$samp_stage_name softupperlim 120
-$samp_stage_name home 35.997
-$samp_stage_name backlash_offset -0.2
+if {$use_normal_config == "true"} {
+  Motor s1 $motor_driver_type [params \
+    asyncqueue mc2\
+    host mc2-taipan\
+    port pmc2-taipan\
+    axis E\
+    units degrees\
+    hardlowerlim -194\
+    hardupperlim 134\
+    maxSpeed 4\
+    maxAccel 2\
+    maxDecel 2\
+    stepsPerX 12495\
+    absEnc 1\
+    absEncHome 10695068\
+    cntsPerX 4096]
+  s1 part sample
+  s1 long_name s1
+  s1 softlowerlim -170
+  s1 softupperlim 120
+  s1 home 35.997
+  s1 backlash_offset -0.2
+}
 
 # mc2: Analyser Detector Rotate -- Sample Scattering Angle
 # absEncHome 20728908\ at -50