Re-order and adjust towards engineering drawings

r1315 | dcl | 2006-11-22 17:34:50 +1100 (Wed, 22 Nov 2006) | 2 lines
This commit is contained in:
Douglas Clowes
2006-11-22 17:34:50 +11:00
parent c7b7dfceed
commit 68a8b2ff49
3 changed files with 585 additions and 554 deletions

View File

@@ -21,41 +21,19 @@ set dmc2280_controller4(port) pmc4-kowari
# dmc_close dmc2280_controller4
#}
# Monochromator omega, rotate
Motor mom DMC2280 [params \
# Monochromator phi, Tilt 1, upper
Motor mphi DMC2280 [params \
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
axis E\
port $dmc2280_controller1(port)\
axis A\
units degrees\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -12500]
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)\
port $dmc2280_controller1(port)\
axis F\
units degrees\
maxSpeed 0.5\
maxAccel 0.2\
maxDecel 0.2\
stepsPerX 25000]
setHomeandRange -motor mtth -home 120 -lowrange 35 -uprange 35
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
stepsPerX -25000]
setHomeandRange -motor mphi -home 0 -lowrange 20 -uprange 20
mphi speed 1
mphi precision 0.01
# Monochromator chi, Tilt 2, lower
Motor mchi DMC2280 [params \
@@ -71,20 +49,6 @@ setHomeandRange -motor mchi -home 90 -lowrange 20 -uprange 20
mchi speed 1
mchi precision 0.01
# Monochromator phi, Tilt 1, upper
Motor mphi DMC2280 [params \
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
axis A\
units degrees\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -25000]
setHomeandRange -motor mphi -home 0 -lowrange 20 -uprange 20
mphi speed 1
mphi precision 0.01
# Monochromator Trans 1, upper
Motor my DMC2280 [params \
host $dmc2280_controller1(host)\
@@ -113,69 +77,47 @@ setHomeandRange -motor mx -home 0 -lowrange 5 -uprange 5
mx speed 1
mx precision 0.01
# Sample Omega, rotate
Motor som DMC2280 [params \
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
axis E\
# Monochromator omega, rotate
Motor mom DMC2280 [params \
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
axis E\
units degrees\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -12500]
setHomeandRange -motor som -home 0 -lowrange 0 -uprange 360
som speed 1
som precision 0.01
stepsPerX -12500]
setHomeandRange -motor mom -home 0 -lowrange 180 -uprange 180
mom speed 1
mom precision 0.01
# Sample two-theta, detector rotate
Motor stth DMC2280 [params \
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
# Monochromator two-theta, flight-tube rotate
Motor mtth DMC2280 [params \
host $dmc2280_controller1(host)\
port $dmc2280_controller1(port)\
axis F\
units degrees\
maxSpeed 0.2\
maxSpeed 0.5\
maxAccel 0.2\
maxDecel 0.2\
stepsPerX 125000]
setHomeandRange -motor stth -home 90 -lowrange 15 -uprange 15
stth speed 0.5
stth precision 0.01
stepsPerX 25000]
setHomeandRange -motor mtth -home 120 -lowrange 35 -uprange 35
mtth speed 0.5
mtth 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
# Eulerian-chi
Motor echi DMC2280 [params \
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
axis B\
units degrees\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX 25000]
setHomeandRange -motor echi -home 0 -lowrange 0 -uprange 360
echi speed 1
echi precision 0.01
# Eulerian-phi
Motor ephi DMC2280 [params \
# Sample Trans3 (vertical)
Motor sz DMC2280 [params \
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
axis A\
units degrees\
units mm\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX 25000]
setHomeandRange -motor ephi -home 0 -lowrange 0 -uprange 360
ephi speed 1
ephi precision 0.01
setHomeandRange -motor sz -home 0 -lowrange 0 -uprange 700
sz speed 1
sz precision 0.01
# Sample Trans 1 (upper)
Motor sy DMC2280 [params \
@@ -205,27 +147,110 @@ setHomeandRange -motor sx -home 0 -lowrange 250 -uprange 250
sx speed 1
sx precision 0.01
# Sample Trans3 (vertical)
Motor sz DMC2280 [params \
# Sample Omega, rotate
Motor som DMC2280 [params \
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
axis G\
units mm\
axis E\
units degrees\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -12500]
setHomeandRange -motor som -home 0 -lowrange 0 -uprange 360
som speed 1
som precision 0.01
# Sample two-theta, detector rotate
Motor stth DMC2280 [params \
host $dmc2280_controller2(host)\
port $dmc2280_controller2(port)\
axis F\
units degrees\
maxSpeed 0.2\
maxAccel 0.2\
maxDecel 0.2\
stepsPerX 125000]
setHomeandRange -motor stth -home 90 -lowrange 15 -uprange 15
stth speed 0.5
stth precision 0.01
# Monochromator Focusing (HOPG)
Motor mf1 DMC2280 [params \
host $dmc2280_controller3(host)\
port $dmc2280_controller3(port)\
axis A\
units degrees\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX 25000]
setHomeandRange -motor mf1 -home 0 -lowrange 0 -uprange 360
mf1 speed 1
mf1 precision 0.01
# Monochromator Fucusing (Ge)
Motor mf2 DMC2280 [params \
host $dmc2280_controller3(host)\
port $dmc2280_controller3(port)\
axis B\
units degrees\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX 25000]
setHomeandRange -motor sz -home 0 -lowrange 0 -uprange 700
sz speed 1
sz precision 0.01
setHomeandRange -motor mf2 -home 0 -lowrange 0 -uprange 360
mf2 speed 1
mf2 precision 0.01
## Eulerian-chi
#Motor echi DMC2280 [params \
# host $dmc2280_controller3(host)\
# port $dmc2280_controller3(port)\
# axis G\
# units degrees\
# maxSpeed 1\
# maxAccel 1\
# maxDecel 1\
# stepsPerX 25000]
#setHomeandRange -motor echi -home 0 -lowrange 0 -uprange 360
#echi speed 1
#echi precision 0.01
## Eulerian-phi
#Motor ephi DMC2280 [params \
# host $dmc2280_controller3(host)\
# port $dmc2280_controller3(port)\
# axis H\
# units degrees\
# maxSpeed 1\
# maxAccel 1\
# maxDecel 1\
# stepsPerX 25000]
#setHomeandRange -motor ephi -home 0 -lowrange 0 -uprange 360
#ephi speed 1
#ephi precision 0.01
#--------------------------------------------------------
# Primary Slit, horizontal offset, 0-30mm
Motor psho DMC2280 [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis A\
units mm\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -20125\
motorHome 542093]
setHomeandRange -motor psho -home 0 -lowrange 0 -uprange 30
# Primary Slit, position 0-150mm
Motor psp DMC2280 [params \
host $dmc2280_controller3(host)\
port $dmc2280_controller3(port)\
axis E\
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis B\
units mm\
maxSpeed 1\
maxAccel 1\
@@ -236,9 +261,9 @@ setHomeandRange -motor psp -home 0 -lowrange 0 -uprange 150
# Primary Slit, width, 0-30mm
Motor psw DMC2280 [params \
host $dmc2280_controller3(host)\
port $dmc2280_controller3(port)\
axis F\
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis C\
units mm\
maxSpeed 1\
maxAccel 1\
@@ -247,39 +272,39 @@ Motor psw DMC2280 [params \
motorHome 2040518]
setHomeandRange -motor psw -home 0 -lowrange 0 -uprange 30
# Primary Slit, height, 0-30mm
Motor psh DMC2280 [params \
host $dmc2280_controller3(host)\
port $dmc2280_controller3(port)\
axis G\
units mm\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -20125\
motorHome 542093]
setHomeandRange -motor psh -home 0 -lowrange 0 -uprange 30
# Primary Slit, horizontal offset, 0-30mm
Motor psho DMC2280 [params \
host $dmc2280_controller3(host)\
port $dmc2280_controller3(port)\
axis H\
units mm\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -20125\
motorHome 542093]
setHomeandRange -motor psho -home 0 -lowrange 0 -uprange 30
## Primary Slit, height, 0-30mm
#Motor psh DMC2280 [params \
# host $dmc2280_controller4(host)\
# port $dmc2280_controller4(port)\
# axis D\
# units mm\
# maxSpeed 1\
# maxAccel 1\
# maxDecel 1\
# stepsPerX -20125\
# motorHome 542093]
#setHomeandRange -motor psh -home 0 -lowrange 0 -uprange 30
#--------------------------------------------------------
# Secondary Slit, horizontal offset
Motor ssho DMC2280 [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis E\
units mm\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -20125\
motorHome 500000]
setHomeandRange -motor ssho -home 0 -lowrange 0 -uprange 30
# Secondary Slit, position
Motor ssp DMC2280 [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis E\
axis F\
units mm\
maxSpeed 1\
maxAccel 1\
@@ -292,7 +317,7 @@ setHomeandRange -motor ssp -home 0 -lowrange 0 -uprange 150
Motor ssw DMC2280 [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis F\
axis G\
units mm\
maxSpeed 1\
maxAccel 1\
@@ -301,31 +326,36 @@ Motor ssw DMC2280 [params \
motorHome 2043085]
setHomeandRange -motor ssw -home 0 -lowrange 0 -uprange 30
# Secondary Slit, height
Motor ssh DMC2280 [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis G\
units mm\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -20125\
motorHome 500000]
setHomeandRange -motor ssh -home 0 -lowrange 0 -uprange 30
## Secondary Slit, height
#Motor ssh DMC2280 [params \
# host $dmc2280_controller4(host)\
# port $dmc2280_controller4(port)\
# axis H\
# units mm\
# maxSpeed 1\
# maxAccel 1\
# maxDecel 1\
# stepsPerX -20125\
# motorHome 500000]
#setHomeandRange -motor ssh -home 0 -lowrange 0 -uprange 30
# Secondary Slit, horizontal offset
Motor ssho DMC2280 [params \
host $dmc2280_controller4(host)\
port $dmc2280_controller4(port)\
axis H\
units mm\
maxSpeed 1\
maxAccel 1\
maxDecel 1\
stepsPerX -20125\
motorHome 500000]
setHomeandRange -motor ssho -home 0 -lowrange 0 -uprange 30
#--------------------------------------------------------
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 sthSet user
publish sthGet user
MakeConfigurableMotor sth
sth readscript sthGet
sth drivescript sthSet
#--------------------------------------------------------