Update Motor Controller 2 (sample + detector) from floor observations

r1337 | dcl | 2006-12-01 15:08:36 +1100 (Fri, 01 Dec 2006) | 2 lines
2006-12-01 15:08:36 +11:00
parent 1cbbea0d12
commit e0f0e4c947
1 changed files with 296 additions and 268 deletions
--- a/site_ansto/instrument/hrpd/motor_configuration.tcl
+++ b/site_ansto/instrument/hrpd/motor_configuration.tcl
@@ -23,6 +23,12 @@ set dmc2280_controller4(port) pmc4-echidna
 #  dmc_close dmc2280_controller4
 #}

+############################
+# Motor Controller 1
+############################
+#:TP at HOME
+#
+
 # Monochromator phi, Tilt 1, upper
 Motor mphi DMC2280 [params \
  host $dmc2280_controller1(host)\
@@ -36,7 +42,7 @@ Motor mphi DMC2280 [params \
  absEnc 1\
  absEncHome 7414753\
  cntsPerX -8192]
-setHomeandRange -motor mphi -home 0 -lowrange 5 -uprange 5
+setHomeandRange -motor mphi -home 0 -lowrange 15 -uprange 15
 mphi speed 1
 mphi precision 0.01

@@ -53,7 +59,7 @@ Motor mchi DMC2280 [params \
  absEnc 1\
  absEncHome 7818915\
  cntsPerX 8192]
-setHomeandRange -motor mchi -home 90 -lowrange 5 -uprange 5 
+setHomeandRange -motor mchi -home 90 -lowrange 15 -uprange 15 
 mchi speed 1
 mchi precision 0.01

@@ -70,7 +76,7 @@ Motor my DMC2280 [params \
  absEnc 1\
  absEncHome 7781680\
  cntsPerX 8192]
-setHomeandRange -motor my -home 0 -lowrange 5 -uprange 5
+setHomeandRange -motor my -home 0 -lowrange 20 -uprange 20
 my speed 1
 my precision 0.01

@@ -87,7 +93,7 @@ Motor mx DMC2280 [params \
  absEnc 1\
  absEncHome 7562793\
  cntsPerX 8192]
-setHomeandRange -motor mx -home 0 -lowrange 5 -uprange 5
+setHomeandRange -motor mx -home 0 -lowrange 20 -uprange 20
 mx speed 1
 mx precision 0.01

@@ -104,7 +110,7 @@ Motor mom DMC2280 [params \
  absEnc 1\
  absEncHome 17694127\
  cntsPerX -8192]
-setHomeandRange -motor mom -home 0 -lowrange 15 -uprange 15
+setHomeandRange -motor mom -home 0 -lowrange 180 -uprange 180
 mom speed 1
 mom precision 0.01

@@ -122,10 +128,10 @@ Motor mtth DMC2280 [params \
  absEncHome 10299428\
  cntsPerX 93207]
 mtth hardlowerlim 85
-mtth hardupperlim 135
+mtth hardupperlim 155
 mtth softlowerlim 85
-mtth softupperlim 135
-mtth home 87.635 
+mtth softupperlim 155
+mtth home 120
 mtth speed 0.5
 mtth precision 0.01

@@ -157,7 +163,13 @@ mtth precision 0.01
 #pc2 speed 1
 #pc2 precision 0.01

-# Sample Tilt 1, upper
+############################
+# Motor Controller 2
+############################
+#:TP at HOME
+# 7924507, 7542917, 7626584, 24029910, 24984596, 14530407, 22369621, 22369621
+
+# Sample Tilt 1, upper, phi
 Motor sphi DMC2280 [params \
  host $dmc2280_controller2(host)\
  port $dmc2280_controller2(port)\
@@ -168,13 +180,13 @@ Motor sphi DMC2280 [params \
  maxDecel 1\
  stepsPerX -25000\
  absEnc 1\
-	absEncHome 7924166\
+  absEncHome 7924507\
  cntsPerX -8192]
-setHomeandRange -motor sphi -home 0 -lowrange 5 -uprange 5
+setHomeandRange -motor sphi -home 0 -lowrange 20 -uprange 20
 sphi speed 1
 sphi precision 0.01

-# Sample Tilt 2, lower
+# Sample Tilt 2, lower, chi
 Motor schi DMC2280 [params \
  host $dmc2280_controller2(host)\
  port $dmc2280_controller2(port)\
@@ -185,13 +197,13 @@ Motor schi DMC2280 [params \
  maxDecel 1\
  stepsPerX 25000\
  absEnc 1\
-	absEncHome 7543198\
+  absEncHome 7542917\
  cntsPerX 8192]
-setHomeandRange -motor schi -home 90 -lowrange 5 -uprange 5
+setHomeandRange -motor schi -home 90 -lowrange 20 -uprange 20
 schi speed 1
 schi precision 0.01

-# Sample Trans 1 (upper)
+# Sample Trans 1, upper, y
 Motor sy DMC2280 [params \
  host $dmc2280_controller2(host)\
  port $dmc2280_controller2(port)\
@@ -202,13 +214,13 @@ Motor sy DMC2280 [params \
  maxDecel 1\
  stepsPerX 25000\
  absEnc 1\
-	absEncHome 7625856\
+  absEncHome 7626584\
  cntsPerX 8192]
-setHomeandRange -motor sy -home 0 -lowrange 5 -uprange 5 
+setHomeandRange -motor sy -home 0 -lowrange 20 -uprange 20 
 sy speed 1
 sy precision 0.01

-# Sample Trans2 (lower)
+# Sample Trans2. lower, x
 Motor sx DMC2280 [params \
  host $dmc2280_controller2(host)\
  port $dmc2280_controller2(port)\
@@ -217,11 +229,11 @@ Motor sx DMC2280 [params \
  maxSpeed 1\
  maxAccel 1\
  maxDecel 1\
-	stepsPerX 25000\
+  stepsPerX -25000\
  absEnc 1\
-	absEncHome 24034020\
-	cntsPerX 8192]
-setHomeandRange -motor sx -home 0 -lowrange 5 -uprange 5 
+  absEncHome 24029910\
+  cntsPerX -8192]
+setHomeandRange -motor sx -home 0 -lowrange 20 -uprange 20 
 sx speed 1
 sx precision 0.01

@@ -231,15 +243,15 @@ Motor som DMC2280 [params \
  port $dmc2280_controller2(port)\
  axis E\
  units degrees\
-  maxSpeed 4\
+  maxSpeed 1\
  maxAccel 1\
  maxDecel 1\
  stepsPerX 12500\
  absEnc 1\
-	absEncHome 24982987\
+  absEncHome 24984596\
  cntsPerX 4096]
-setHomeandRange -motor som -home 0 -lowrange 140 -uprange 205
-som speed 2
+setHomeandRange -motor som -home 0 -lowrange 142 -uprange 218
+som speed 1
 som precision 0.01

 # Sample two-theta, detector rotate
@@ -253,10 +265,14 @@ Motor stth DMC2280 [params \
  maxDecel 0.2\
  stepsPerX 125000\
  absEnc 1\
-	absEncHome 6559259\
-	cntsPerX 93207]
-setHomeandRange -motor stth -home 120 -lowrange 15 -uprange 15
-stth speed 0.5
+  absEncHome 14530407\
+  cntsPerX -93207]
+stth hardlowerlim -74
+stth hardupperlim 74
+stth softlowerlim -70
+stth softupperlim 70
+stth home 0
+stth speed 0.2
 stth precision 0.01

 #Default upper and lower ranges for vertical slits
@@ -267,12 +283,18 @@ set vertSlitUpRange 95
 set horSlitLowRange 20
 set horSlitUpRange 25

+############################
+# Motor Controller 3
+############################
+#:TP at HOME
+#
+
 # Monochromator radius, focus
 #Motor mr DMC2280 [params \
 #  host $dmc2280_controller3(host)\
 #  port $dmc2280_controller3(port)\
 #  axis A\
-#  units xxxx\
+#  units degrees\
 #  maxSpeed xxxx\
 #  maxAccel xxxx\
 #  maxDecel xxxx\
@@ -280,7 +302,7 @@ set horSlitUpRange 25
 #  absEnc 1\
 #  absEncHome xxxx\
 #  cntsPerX xxxx]
-#setHomeandRange -motor mr -home 0 -lowrange 0 -uprange 0
+#setHomeandRange -motor mr -home 0 -lowrange 0 -uprange 360
 #mr speed 1
 #mr precision 0.01

@@ -332,26 +354,18 @@ Motor ss1l DMC2280 [params \
  motorHome 592406]
 setHomeandRange -motor ss1l  -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange 

-#xxxx WHICH CONTROLLER DO ECHI AND EPHI BELONG TO
-#Motor echi DMC2280 [params \
-#	host $dmc2280_controller4(host)\
-#	port $dmc2280_controller4(port)\
-#	axis A\
-# units xxxx\
-# maxSpeed xxxx\
-# maxAccel xxxx\
-# maxDecel xxxx\
-#	stepsPerX xxxx\
-#	absEnc 1\
-#	absEncHome xxxx\
-#	cntsPerX xxxx]
-#setHomeandRange -motor echi -home 0 -lowrange 0 -uprange 360
+############################
+# Motor Controller 4
+############################
+#:TP at HOME
+#

+# Little is known about the Eularian Cradle
 #Motor ephi DMC2280 [params \
 #  host $dmc2280_controller4(host)\
 #  port $dmc2280_controller4(port)\
-#	axis B\
-# units xxxx\
+#  axis A\
+#  units degrees\
 #  maxSpeed xxxx\
 #  maxAccel xxxx\
 #  maxDecel xxxx\
@@ -359,7 +373,21 @@ setHomeandRange -motor ss1l  -home 0 -lowrange $horSlitLowRange -uprange $horSli
 #  absEnc 1\
 #  absEncHome xxxx\
 #  cntsPerX xxxx]
-#setHomeandRange -motor ephi -home 0 -lowrange 0 -uprange 360
+#setHomeandRange -motor ephi -home 0 -lowrange 180 -uprange 180
+
+#Motor echi DMC2280 [params \
+#  host $dmc2280_controller4(host)\
+#  port $dmc2280_controller4(port)\
+#  axis B\
+#  units degrees\
+#  maxSpeed xxxx\
+#  maxAccel xxxx\
+#  maxDecel xxxx\
+#  stepsPerX xxxx\
+#  absEnc 1\
+#  absEncHome xxxx\
+#  cntsPerX xxxx]
+#setHomeandRange -motor echi -home 0 -lowrange 180 -uprange 180

 Motor ss2u DMC2280 [params \
  host $dmc2280_controller4(host)\