Update to match Echidna more closely

r1339 | dcl | 2006-12-01 15:10:04 +1100 (Fri, 01 Dec 2006) | 2 lines

site_ansto/instrument/hipd/motor_configuration.tcl

@@ -23,102 +23,102 @@ set dmc2280_controller4(port) pmc4-wombat
 
 # Monochromator phi, Tilt 1, upper
 Motor mphi DMC2280 [params \
-	host $dmc2280_controller1(host)\
+  host $dmc2280_controller1(host)\
-	port $dmc2280_controller1(port)\
+  port $dmc2280_controller1(port)\
-	axis A\
+  axis A\
- units degrees\
+  units degrees\
- maxSpeed 1\
+  maxSpeed 1\
- maxAccel 1\
+  maxAccel 1\
- maxDecel 1\
+  maxDecel 1\
-	stepsPerX -25000\
+  stepsPerX -25000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 7414753\
+  absEncHome 7414753\
-	cntsPerX -8192]
+  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
+mphi precision 0.001
 
 # Monochromator chi, Tilt 2, lower
 Motor mchi DMC2280 [params \
-	host $dmc2280_controller1(host)\
+  host $dmc2280_controller1(host)\
-	port $dmc2280_controller1(port)\
+  port $dmc2280_controller1(port)\
-	axis B\
+  axis B\
- units degrees\
+  units degrees\
- maxSpeed 1\
+  maxSpeed 1\
- maxAccel 1\
+  maxAccel 1\
- maxDecel 1\
+  maxDecel 1\
-	stepsPerX 25000\
+  stepsPerX 25000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 7818915\
+  absEncHome 7818915\
-	cntsPerX 8192]
+  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
+mchi precision 0.001
 
 # Monochromator Trans 1, upper
 Motor my DMC2280 [params \
-	host $dmc2280_controller1(host)\
+  host $dmc2280_controller1(host)\
-	port $dmc2280_controller1(port)\
+  port $dmc2280_controller1(port)\
-	axis C\
+  axis C\
- units mm\
+  units mm\
- maxSpeed 1\
+  maxSpeed 1\
- maxAccel 1\
+  maxAccel 1\
- maxDecel 1\
+  maxDecel 1\
-	stepsPerX 25000\
+  stepsPerX 25000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 7781680\
+  absEncHome 7781680\
-	cntsPerX 8192]
+  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
 
 # Monochromator Trans 2, lower
 Motor mx DMC2280 [params \
-	host $dmc2280_controller1(host)\
+  host $dmc2280_controller1(host)\
-	port $dmc2280_controller1(port)\
+  port $dmc2280_controller1(port)\
-	axis D\
+  axis D\
- units mm\
+  units mm\
- maxSpeed 1\
+  maxSpeed 1\
- maxAccel 1\
+  maxAccel 1\
- maxDecel 1\
+  maxDecel 1\
-	stepsPerX 25000\
+  stepsPerX 25000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 7562793\
+  absEncHome 7562793\
-	cntsPerX 8192]
+  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
 
 # Monochromator omega, rotate
 Motor mom DMC2280 [params \
-	host $dmc2280_controller1(host)\
+  host $dmc2280_controller1(host)\
-	port $dmc2280_controller1(port)\
+  port $dmc2280_controller1(port)\
-	axis E\
+  axis E\
- units degrees\
+  units degrees\
- maxSpeed 1\
+  maxSpeed 1\
- maxAccel 1\
+  maxAccel 1\
- maxDecel 1\
+  maxDecel 1\
-	stepsPerX -12500\
+  stepsPerX -12500\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 17694127\
+  absEncHome 17694127\
-	cntsPerX -8192]
+  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
 
 # Monochromator two-theta, flight-tube rotate
 Motor mtth DMC2280 [params \
-	host $dmc2280_controller1(host)\
+  host $dmc2280_controller1(host)\
-	port $dmc2280_controller1(port)\
+  port $dmc2280_controller1(port)\
-	axis F\
+  axis F\
- units degrees\
+  units degrees\
- maxSpeed 0.5\
+  maxSpeed 0.5\
- maxAccel 0.2\
+  maxAccel 0.2\
- maxDecel 0.2\
+  maxDecel 0.2\
-	stepsPerX 25000\
+  stepsPerX 25000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 10299428\
+  absEncHome 10299428\
-	cntsPerX 93207]
+  cntsPerX 93207]
 mtth hardlowerlim 85
 mtth hardupperlim 155
 mtth softlowerlim 85
@@ -127,124 +127,113 @@ mtth home 120
 mtth speed 0.5
 mtth precision 0.01
 
-proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
-proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
-publish mthSet user
-publish mthGet user
-MakeConfigurableMotor mth
-mth readscript mthGet
-mth drivescript mthSet
 
 # Sample Tilt 1, upper
 Motor sphi DMC2280 [params \
-	host $dmc2280_controller2(host)\
+  host $dmc2280_controller2(host)\
-	port $dmc2280_controller2(port)\
+  port $dmc2280_controller2(port)\
-	axis A\
+  axis A\
   units degrees\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
-	stepsPerX 25000\
+  stepsPerX 25000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 7934290\
+  absEncHome 7934290\
-	cntsPerX 8192]
+  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
 Motor schi DMC2280 [params \
-	host $dmc2280_controller2(host)\
+  host $dmc2280_controller2(host)\
-	port $dmc2280_controller2(port)\
+  port $dmc2280_controller2(port)\
-	axis B\
+  axis B\
   units degrees\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
-	stepsPerX 25000\
+  stepsPerX 25000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 7581355\
+  absEncHome 7581355\
-	cntsPerX 8192]
+  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)
 Motor sy DMC2280 [params \
-	host $dmc2280_controller2(host)\
+  host $dmc2280_controller2(host)\
-	port $dmc2280_controller2(port)\
+  port $dmc2280_controller2(port)\
-	axis C\
+  axis C\
   units mm\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
-	stepsPerX 25000\
+  stepsPerX 25000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 7562793\
+  absEncHome 7562793\
-	cntsPerX 8192]
+  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)
 Motor sx DMC2280 [params \
-	host $dmc2280_controller2(host)\
+  host $dmc2280_controller2(host)\
-	port $dmc2280_controller2(port)\
+  port $dmc2280_controller2(port)\
-	axis D\
+  axis D\
   units mm\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
-	stepsPerX 25000\
+  stepsPerX 25000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 7562793\
+  absEncHome 7562793\
-	cntsPerX 8192]
+  cntsPerX 8192]
-setHomeandRange -motor sx -home 0 -lowrange 5 -uprange 5 
+setHomeandRange -motor sx -home 0 -lowrange 20 -uprange 20 
 sx speed 1
 sx precision 0.01
 
 # Sample Omega, rotate
 Motor som DMC2280 [params \
-	host $dmc2280_controller2(host)\
+  host $dmc2280_controller2(host)\
-	port $dmc2280_controller2(port)\
+  port $dmc2280_controller2(port)\
-	axis E\
+  axis E\
   units degrees\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
-	stepsPerX -12500\
+  stepsPerX -12500\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 17694127\
+  absEncHome 17694127\
-	cntsPerX -8192]
+  cntsPerX -8192]
-setHomeandRange -motor som -home 0 -lowrange 45 -uprange 45
+setHomeandRange -motor som -home 0 -lowrange 180 -uprange 180
 som speed 1
 som precision 0.01
 
 # Sample two-theta, detector rotate
 Motor stth DMC2280 [params \
-	host $dmc2280_controller2(host)\
+  host $dmc2280_controller2(host)\
-	port $dmc2280_controller2(port)\
+  port $dmc2280_controller2(port)\
-	axis F\
+  axis F\
   units degrees\
   maxSpeed 0.2\
   maxAccel 0.2\
   maxDecel 0.2\
-	stepsPerX 125000\
+  stepsPerX 125000\
-	absEnc 1\
+  absEnc 1\
-	absEncHome 6559259\
+  absEncHome 6559259\
-	cntsPerX 93207]
+  cntsPerX 93207]
-setHomeandRange -motor stth -home 120 -lowrange 15 -uprange 15
+stth hardlowerlim 85
+stth hardupperlim 155
+stth softlowerlim 85
+stth softupperlim 155
+stth home 87.635 
 stth speed 0.5
 stth precision 0.01
 
-proc sthGet {} { return [expr [SplitReply [stth]]/2.0]}
-proc sthSet {val} { return "stth=[SplitReply [stth]]"}
-publish sthSet user
-publish sthGet user
-MakeConfigurableMotor sth
-sth readscript sthGet
-sth drivescript sthSet
-
 #Default upper and lower ranges for vertical slits
 set vertSlitLowRange 25
 set vertSlitUpRange 95
@@ -255,130 +244,146 @@ set horSlitUpRange 25
 
 # Monochromator radius, focus
 #Motor mr DMC2280 [params \
-#	host $dmc2280_controller3(host)\
+#  host $dmc2280_controller3(host)\
-#	port $dmc2280_controller3(port)\
+#  port $dmc2280_controller3(port)\
-#	axis A\
+#  axis A\
-# units xxxx\
+#  units degrees\
-# maxSpeed xxxx\
+#  maxSpeed xxxx\
-# maxAccel xxxx\
+#  maxAccel xxxx\
-# maxDecel xxxx\
+#  maxDecel xxxx\
-#	stepsPerX xxxx\
+#  stepsPerX xxxx\
-#	absEnc 1\
+#  absEnc 1\
-#	absEncHome xxxx\
+#  absEncHome xxxx\
-#	cntsPerX 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
 
 Motor ss1u DMC2280 [params \
-	host $dmc2280_controller3(host)\
+  host $dmc2280_controller3(host)\
-	port $dmc2280_controller3(port)\
+  port $dmc2280_controller3(port)\
-	axis E\
+  axis E\
   units mm\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
-	stepsPerX -20125\
+  stepsPerX -20125\
   motorHome 2040518]
 setHomeandRange -motor ss1u -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange
 
 Motor ss1d DMC2280 [params \
-	host $dmc2280_controller3(host)\
+  host $dmc2280_controller3(host)\
-	port $dmc2280_controller3(port)\
+  port $dmc2280_controller3(port)\
-	axis F\
+  axis F\
   units mm\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
-	stepsPerX -20125\
+  stepsPerX -20125\
   motorHome 2040518]
 setHomeandRange -motor ss1d -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange 
 
 Motor ss1r DMC2280 [params \
-	host $dmc2280_controller3(host)\
+  host $dmc2280_controller3(host)\
-	port $dmc2280_controller3(port)\
+  port $dmc2280_controller3(port)\
-	axis G\
+  axis G\
   units mm\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
-	stepsPerX -20125\
+  stepsPerX -20125\
   motorHome 542093]
 setHomeandRange -motor ss1r  -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange 
 
 Motor ss1l DMC2280 [params \
-	host $dmc2280_controller3(host)\
+  host $dmc2280_controller3(host)\
-	port $dmc2280_controller3(port)\
+  port $dmc2280_controller3(port)\
-	axis H\
+  axis H\
   units mm\
   maxSpeed 1\
   maxAccel 1\
   maxDecel 1\
-	stepsPerX -20125\
+  stepsPerX -20125\
   motorHome 542093]
 setHomeandRange -motor ss1l  -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange 
 
 Motor ss2u DMC2280 [params \
-	host $dmc2280_controller4(host)\
+  host $dmc2280_controller4(host)\
-	port $dmc2280_controller4(port)\
+  port $dmc2280_controller4(port)\
-	axis E\
+  axis E\
-	units mm\
+  units mm\
-	maxSpeed 1\
+  maxSpeed 1\
-	maxAccel 1\
+  maxAccel 1\
-	maxDecel 1\
+  maxDecel 1\
-	stepsPerX -20125\
+  stepsPerX -20125\
   motorHome 2043085]
 setHomeandRange -motor ss2u  -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange 
 
 Motor ss2d DMC2280 [params \
-	host $dmc2280_controller4(host)\
+  host $dmc2280_controller4(host)\
-	port $dmc2280_controller4(port)\
+  port $dmc2280_controller4(port)\
-	axis F\
+  axis F\
-	units mm\
+  units mm\
-	maxSpeed 1\
+  maxSpeed 1\
-	maxAccel 1\
+  maxAccel 1\
-	maxDecel 1\
+  maxDecel 1\
-	stepsPerX -20125\
+  stepsPerX -20125\
   motorHome 2043085]
 setHomeandRange -motor ss2d  -home 0 -lowrange $vertSlitLowRange -uprange $vertSlitUpRange 
 
 Motor ss2r DMC2280 [params \
-	host $dmc2280_controller4(host)\
+  host $dmc2280_controller4(host)\
-	port $dmc2280_controller4(port)\
+  port $dmc2280_controller4(port)\
-	axis G\
+  axis G\
-	units mm\
+  units mm\
-	maxSpeed 1\
+  maxSpeed 1\
-	maxAccel 1\
+  maxAccel 1\
-	maxDecel 1\
+  maxDecel 1\
-	stepsPerX -20125\
+  stepsPerX -20125\
   motorHome 500000]
 setHomeandRange -motor ss2r  -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange 
 
 Motor ss2l DMC2280 [params \
-	host $dmc2280_controller4(host)\
+  host $dmc2280_controller4(host)\
-	port $dmc2280_controller4(port)\
+  port $dmc2280_controller4(port)\
-	axis H\
+  axis H\
-	units mm\
+  units mm\
-	maxSpeed 1\
+  maxSpeed 1\
-	maxAccel 1\
+  maxAccel 1\
-	maxDecel 1\
+  maxDecel 1\
-	stepsPerX -20125\
+  stepsPerX -20125\
   motorHome 500000]
 setHomeandRange -motor ss2l  -home 0 -lowrange $horSlitLowRange -uprange $horSlitUpRange 
 
+proc mthGet {} { return [expr [SplitReply [mtth]]/2.0]}
+proc mthSet {val} { return "mtth=[SplitReply [mtth]]"}
+publish mthSet user
+publish mthGet user
+MakeConfigurableMotor mth
+mth readscript mthGet
+mth drivescript mthSet
+
+proc sthGet {} { return [expr [SplitReply [stth]]/2.0]}
+proc sthSet {val} { return "stth=[SplitReply [stth]]"}
+publish sthGet user
+publish sthSet user
+MakeConfigurableMotor sth
+sth readscript sthGet
+sth drivescript sthSet
+
 #--------------------------------------------------------
 proc ss1widthscript {val} {
-	set currentWidth [expr [SplitReply [ss1r]] + [SplitReply [ss1l]]]
+  set currentWidth [expr [SplitReply [ss1r]] + [SplitReply [ss1l]]]
-	set diff [expr $val - $currentWidth]
+  set diff [expr $val - $currentWidth]
-	set newD1R [expr [SplitReply [ss1r]] + $diff/2]
+  set newD1R [expr [SplitReply [ss1r]] + $diff/2]
-	set newD1L [expr [SplitReply [ss1l]] + $diff/2]
+  set newD1L [expr [SplitReply [ss1l]] + $diff/2]
-	return "ss1r=$newD1R,ss1l=$newD1L"
+  return "ss1r=$newD1R,ss1l=$newD1L"
 }
 publish ss1widthscript user
 
 #-------------------------------------------------------
 proc ss1readwidth {} {
-	return [expr [SplitReply [ss1r]] + [SplitReply [ss1l]]] 
+  return [expr [SplitReply [ss1r]] + [SplitReply [ss1l]]] 
 }
 publish ss1readwidth user
 MakeConfigurableMotor ss1hg
@@ -389,18 +394,18 @@ ss1hg readscript ss1readwidth
 proc ss1horoffsetscript {val} {
   set SR [SplitReply [ss1r]]
   set SL [SplitReply [ss1l]]
-	set currentOffset [ expr $SR - ($SR + $SL)/2.0 ] 
+  set currentOffset [ expr $SR - ($SR + $SL)/2.0 ] 
-	set diff [expr $val - $currentOffset]
+  set diff [expr $val - $currentOffset]
-	set newD1R [expr $SR + $diff]
+  set newD1R [expr $SR + $diff]
-	set newD1L [expr $SL - $diff]
+  set newD1L [expr $SL - $diff]
-	return "ss1r=$newD1R,ss1l=$newD1L"
+  return "ss1r=$newD1R,ss1l=$newD1L"
 }
 publish ss1horoffsetscript user
 
 #-------------------------------------------------------
 proc ss1readhoroffset {} {
   set SR [SplitReply [ss1r]]
-	return [ expr $SR - ($SR + [SplitReply [ss1l]])/2.0 ] 
+  return [ expr $SR - ($SR + [SplitReply [ss1l]])/2.0 ] 
 }
 publish ss1readhoroffset user
 
@@ -411,17 +416,17 @@ ss1ho readscript ss1readhoroffset
 
 #-----------------------------------------------------
 proc ss1heightscript {val} {
-	set currentWidth [expr [SplitReply [ss1u]] + [SplitReply [ss1d]]]
+  set currentWidth [expr [SplitReply [ss1u]] + [SplitReply [ss1d]]]
-	set diff [expr $val - $currentWidth]
+  set diff [expr $val - $currentWidth]
-	set newD1B [expr [SplitReply [ss1d]] + $diff/2]
+  set newD1B [expr [SplitReply [ss1d]] + $diff/2]
-	set newD1T [expr [SplitReply [ss1u]] + $diff/2]
+  set newD1T [expr [SplitReply [ss1u]] + $diff/2]
-	return "ss1d=$newD1B,ss1u=$newD1T"
+  return "ss1d=$newD1B,ss1u=$newD1T"
 }
 publish ss1heightscript user
 
 #-------------------------------------------------------
 proc ss1readheight {} {
-	return [expr [SplitReply [ss1u]] + [SplitReply [ss1d]]] 
+  return [expr [SplitReply [ss1u]] + [SplitReply [ss1d]]] 
 }
 publish ss1readheight user
 
@@ -434,18 +439,18 @@ ss1vg readscript ss1readheight
 proc ss1vertoffsetscript {val} {
   set SU [SplitReply [ss1u]]
   set SD [SplitReply [ss1d]]
-	set currentOffset [ expr $SU - ($SU + $SD)/2.0 ] 
+  set currentOffset [ expr $SU - ($SU + $SD)/2.0 ] 
-	set diff [expr $val - $currentOffset]
+  set diff [expr $val - $currentOffset]
-	set newD1U [expr $SU + $diff]
+  set newD1U [expr $SU + $diff]
-	set newD1D [expr $SD - $diff]
+  set newD1D [expr $SD - $diff]
-	return "ss1u=$newD1U,ss1d=$newD1D"
+  return "ss1u=$newD1U,ss1d=$newD1D"
 }
 publish ss1vertoffsetscript user
 
 #-------------------------------------------------------
 proc ss1readvertoffset {} {
   set SU [SplitReply [ss1u]]
-	return [ expr $SU - ($SU + [SplitReply [ss1d]])/2.0 ] 
+  return [ expr $SU - ($SU + [SplitReply [ss1d]])/2.0 ] 
 }
 publish ss1readvertoffset user
 
@@ -458,17 +463,17 @@ ss1vo readscript ss1readvertoffset
 
 #--------------------------------------------------------
 proc ss2widthscript {val} {
-	set currentWidth [expr [SplitReply [ss2r]] + [SplitReply [ss2l]]]
+  set currentWidth [expr [SplitReply [ss2r]] + [SplitReply [ss2l]]]
-	set diff [expr $val - $currentWidth]
+  set diff [expr $val - $currentWidth]
-	set newD1R [expr [SplitReply [ss2r]] + $diff/2]
+  set newD1R [expr [SplitReply [ss2r]] + $diff/2]
-	set newD1L [expr [SplitReply [ss2l]] + $diff/2]
+  set newD1L [expr [SplitReply [ss2l]] + $diff/2]
-	return "ss2r=$newD1R,ss2l=$newD1L"
+  return "ss2r=$newD1R,ss2l=$newD1L"
 }
 publish ss2widthscript user
 
 #-------------------------------------------------------
 proc ss2readwidth {} {
-	return [expr [SplitReply [ss2r]] + [SplitReply [ss2l]]] 
+  return [expr [SplitReply [ss2r]] + [SplitReply [ss2l]]] 
 }
 publish ss2readwidth user
 MakeConfigurableMotor ss2hg
@@ -479,18 +484,18 @@ ss2hg readscript ss2readwidth
 proc ss2horoffsetscript {val} {
   set SR [SplitReply [ss2r]]
   set SL [SplitReply [ss2l]]
-	set currentOffset [ expr $SR - ($SR + $SL)/2.0 ] 
+  set currentOffset [ expr $SR - ($SR + $SL)/2.0 ] 
-	set diff [expr $val - $currentOffset]
+  set diff [expr $val - $currentOffset]
-	set newD1R [expr $SR + $diff]
+  set newD1R [expr $SR + $diff]
-	set newD1L [expr $SL - $diff]
+  set newD1L [expr $SL - $diff]
-	return "ss2r=$newD1R,ss2l=$newD1L"
+  return "ss2r=$newD1R,ss2l=$newD1L"
 }
 publish ss2horoffsetscript user
 
 #-------------------------------------------------------
 proc ss2readhoroffset {} {
   set SR [SplitReply [ss2r]]
-	return [ expr $SR - ($SR + [SplitReply [ss2l]])/2.0 ] 
+  return [ expr $SR - ($SR + [SplitReply [ss2l]])/2.0 ] 
 }
 publish ss2readhoroffset user
 
@@ -501,17 +506,17 @@ ss2ho readscript ss2readhoroffset
 
 #-----------------------------------------------------
 proc ss2heightscript {val} {
-	set currentWidth [expr [SplitReply [ss2u]] + [SplitReply [ss2d]]]
+  set currentWidth [expr [SplitReply [ss2u]] + [SplitReply [ss2d]]]
-	set diff [expr $val - $currentWidth]
+  set diff [expr $val - $currentWidth]
-	set newD1B [expr [SplitReply [ss2d]] + $diff/2]
+  set newD1B [expr [SplitReply [ss2d]] + $diff/2]
-	set newD1T [expr [SplitReply [ss2u]] + $diff/2]
+  set newD1T [expr [SplitReply [ss2u]] + $diff/2]
-	return "ss2d=$newD1B,ss2u=$newD1T"
+  return "ss2d=$newD1B,ss2u=$newD1T"
 }
 publish ss2heightscript user
 
 #-------------------------------------------------------
 proc ss2readheight {} {
-	return [expr [SplitReply [ss2u]] + [SplitReply [ss2d]]] 
+  return [expr [SplitReply [ss2u]] + [SplitReply [ss2d]]] 
 }
 publish ss2readheight user
 
@@ -524,18 +529,18 @@ ss2vg readscript ss2readheight
 proc ss2vertoffsetscript {val} {
   set SU [SplitReply [ss2u]]
   set SD [SplitReply [ss2d]]
-	set currentOffset [ expr $SU - ($SU + $SD)/2.0 ] 
+  set currentOffset [ expr $SU - ($SU + $SD)/2.0 ] 
-	set diff [expr $val - $currentOffset]
+  set diff [expr $val - $currentOffset]
-	set newD1U [expr $SU + $diff]
+  set newD1U [expr $SU + $diff]
-	set newD1D [expr $SD - $diff]
+  set newD1D [expr $SD - $diff]
-	return "ss2u=$newD1U,ss2d=$newD1D"
+  return "ss2u=$newD1U,ss2d=$newD1D"
 }
 publish ss2vertoffsetscript user
 
 #-------------------------------------------------------
 proc ss2readvertoffset {} {
   set SU [SplitReply [ss2u]]
-	return [ expr $SU - ($SU + [SplitReply [ss2d]])/2.0 ] 
+  return [ expr $SU - ($SU + [SplitReply [ss2d]])/2.0 ] 
 }
 publish ss2readvertoffset user
 
@@ -545,4 +550,3 @@ ss2vo drivescript ss2vertoffsetscript
 ss2vo readscript ss2readvertoffset
 
 # END MOTOR CONFIGURATION
-