bring back some changes from the instrument

r3681 | dcl | 2012-07-26 15:47:15 +1000 (Thu, 26 Jul 2012) | 1 line

site_ansto/instrument/tas/config/INSTCFCOMMON.TXT

@@ -22,5 +22,7 @@ config/commands/commands_common.tcl
 config/commands/pulser.tcl
 config/commands/hvcommands.tcl
 config/motors/sct_positmotor_common.tcl
+config/environment/magneticField/sct_oxford_ips.tcl
+config/environment/magneticField/sct_oxford_labview.tcl
 config/motors/sct_jogmotor_common.tcl
 config/motors/sct_aerotech_soloist.tcl

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

@@ -132,6 +132,28 @@ dummy_motor softlowerlim -500
 dummy_motor softupperlim 500
 dummy_motor home 0
 
+Motor dummy_s1 asim [params \
+  asyncqueue mc1\
+  host mc1-taipan\
+  port pmc1-taipan\
+  axis C\
+  units degrees\
+  hardlowerlim -180\
+  hardupperlim 180\
+  maxSpeed 1\
+  maxAccel 5\
+  maxDecel 5\
+  stepsPerX [expr 25000.0/5.0]\
+  absEnc 1\
+  absEncHome $samx_Home\
+  cntsPerX [expr 8192.0/5.0]]
+dummy_s1 part instrument
+dummy_s1 long_name dummy_s1
+dummy_s1 softlowerlim -180
+dummy_s1 softupperlim 180
+dummy_s1 precision 0.02
+dummy_s1 home 0
+
 #if $use_tiltstage {
 # mc1: Monochromator crystal selection rotation/Tilt
 Motor mtilt $motor_driver_type [params \
@@ -183,15 +205,15 @@ mtrans home 0.0
 # mc1: Fight Tube Rotate
 # stepsPerX was 120000 for motor, -150 for encoder
 # these values come from dan's calculated values in the Galil controller
-set m2_cntsPerX [expr -1.0 / 0.006696]
+set m2_cntsPerX [expr 1.0 / 0.006696]
-set m2_stepsPerX [expr 25000 * $m2_cntsPerX / -30.92]
+set m2_stepsPerX [expr -25000 * $m2_cntsPerX / -30.92]
 Motor m2 $motor_driver_type [params \
   asyncqueue mc1\
   host mc1-taipan\
   port pmc1-taipan\
   axis F\
   units degrees\
-  precision 0.2\
+  precision 0.02088\
   hardlowerlim 17\
   hardupperlim 80\
   maxSpeed 1\
@@ -199,15 +221,18 @@ Motor m2 $motor_driver_type [params \
   maxDecel 0.1\
   stepsPerX $m2_stepsPerX\
   absEnc 1\
-  absEncHome 188046\
+  absEncHome 23164830\
   cntsPerX $m2_cntsPerX]
 m2 part crystal 
 m2 long_name m2
 m2 softlowerlim 17
 m2 softupperlim 80
-m2 home 40.92118
+m2 home 20
-m2 motOnDelay 1000
+m2 motOnDelay  2000
-m2 motOffDelay 1000
+m2 motOffDelay 0
+m2 backlash_offset -0.1
+m2 creep_offset 0.1
+m2 creep_precision 0.02088
 
 # mc1: Detector Rotate
 Motor a2 $motor_driver_type [params \
@@ -230,8 +255,11 @@ a2 long_name a2
 a2 softlowerlim -55
 a2 softupperlim 88
 a2 home 40.9188
-a2 motOnDelay 1000
+a2 motOnDelay  2000
-a2 motOffDelay 1000
+a2 motOffDelay 0
+a2 backlash_offset -0.5
+a2 creep_offset 0.1
+a2 creep_precision 0.01
 
 
 ############################
@@ -262,6 +290,7 @@ sgu long_name sgu
 sgu softlowerlim -13
 sgu softupperlim 16.5
 sgu home 0
+sgu backlash_offset -0.2
 
 # mc2: Sample Tilt 2
 Motor sgl $motor_driver_type [params \
@@ -284,6 +313,7 @@ sgl long_name sgl
 sgl softlowerlim -16.5
 sgl softupperlim 17.5
 sgl home 0
+sgl backlash_offset -0.2
 
 # mc2: Sample Up Tanslation
 Motor stu $motor_driver_type [params \
@@ -306,6 +336,7 @@ stu long_name stu
 stu softlowerlim -15
 stu softupperlim 15
 stu home 0.0
+stu backlash_offset -0.2
 
 # mc2: Sample Lower Tanslation
 Motor stl $motor_driver_type [params \
@@ -328,6 +359,7 @@ stl long_name stl
 stl softlowerlim -15
 stl softupperlim 15
 stl home 0.0
+stl backlash_offset -0.2
 
 # mc2: Sample Rotate
 Motor s1 $motor_driver_type [params \
@@ -350,6 +382,7 @@ s1 long_name s1
 s1 softlowerlim -170
 s1 softupperlim 90
 s1 home 35.997
+s1 backlash_offset -0.2
 
 # mc2: Analyser Detector Rotate -- Sample Scattering Angle
 Motor s2 $motor_driver_type [params \
@@ -358,12 +391,12 @@ Motor s2 $motor_driver_type [params \
   port pmc2-taipan\
   axis F\
   units degrees\
-  precision 0.2\
+  precision 0.01\
   hardlowerlim -95\
   hardupperlim 30\
-  maxSpeed 0.8\
+  maxSpeed 1.5\
-  maxAccel 0.2\
+  maxAccel 0.5\
-  maxDecel 0.2\
+  maxDecel 0.5\
   stepsPerX 125000\
   absEnc 1\
   absEncHome 20728908\
@@ -373,8 +406,15 @@ s2 long_name s2
 s2 softlowerlim -78
 s2 softupperlim -1.9
 s2 home -49.9998
-s2 motOnDelay 1000
+s2 motOnDelay  1000
-s2 motOffDelay 1000
+s2 motOffDelay 0
+s2 settle 0
+s2 backlash_offset 0.5
+s2 creep_offset 0.015
+s2 creep_precision 0.01
+s2 speed 1.07
+s2 accel 0.5
+s2 decel 0.5
 
 # mc2: Analyser Horizontal Focus
 Motor ahfocus $motor_driver_type [params \
@@ -503,6 +543,7 @@ m1 long_name m1
 m1 softlowerlim 5
 m1 softupperlim 40
 m1 home 20.45933
+m1 backlash_offset -0.2
 
 # mc4: Analyzer Tilt 1 -- Two-theta Angle
 Motor atilt $motor_driver_type [params \
@@ -525,6 +566,7 @@ atilt long_name atilt
 atilt softlowerlim -5
 atilt softupperlim 5
 atilt home 0.0
+atilt backlash_offset -0.5
 
 # mc4: Analyzer Translate
 Motor atrans $motor_driver_type [params \
@@ -547,6 +589,7 @@ atrans long_name atrans
 atrans softlowerlim -1
 atrans softupperlim 22
 atrans home -0.0006
+atrans backlash_offset -0.5
 
 # mc4: Analyzer Rotate
 Motor a1 $motor_driver_type [params \
@@ -569,6 +612,7 @@ a1 long_name a1
 a1 softlowerlim -5.1
 a1 softupperlim 45
 a1 home 20.4586
+a1 backlash_offset 0.2
 
 # mc4: Virtural Source Left Translation
 Motor VS_left $motor_driver_type [params \
@@ -872,3 +916,22 @@ vei drivescript set_vei
 publish get_vei user
 publish set_vei user
 
+# Convert magnet angle to s1 angle
+proc get_vs1 {} {
+  set angle [GetMagOmPos]
+  return $angle
+}
+
+# Convert s1 angle to magnet angle
+proc set_vs1 {angle} {
+  MagOmMove $angle
+  set result "dummy_motor=$angle"
+  return $result
+}
+
+MakeConfigurableMotor vs1
+vs1 readscript get_vs1
+vs1 drivescript set_vs1
+
+publish get_vs1 user
+publish set_vs1 user

site_ansto/instrument/tas/taipan_configuration.tcl

@@ -34,13 +34,14 @@ fileeval $cfPath(commands)/pulser.tcl
 fileeval $cfPath(commands)/hvcommands.tcl
 fileeval $cfPath(anticollider)/anticollider.tcl
 #fileeval $cfPath(tasmad)/taspub_sics/tasp.tcl
-fileeval $cfPath(tasmad)/taspub_sics/tasscript.tcl
+#fileeval $cfPath(tasmad)/taspub_sics/tasscript.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_lakeshore_340.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_370.tcl
 fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl
+fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl
 fileeval $cfPath(environment)/temperature/west400.tcl
 fileeval $cfPath(environment)/magnetic/oxford_labview.tcl
 fileeval log.tcl