r3069 | jgn | 2011-02-24 10:15:51 +1100 (Thu, 24 Feb 2011) | 1 line
This commit is contained in:
committed by
Douglas Clowes
parent
0808b54652
commit
c21177047e
@@ -159,8 +159,8 @@ set move_count 100
|
||||
|
||||
Motor dummy_motor asim [params \
|
||||
asyncqueue mc1\
|
||||
host mc1-taipan\
|
||||
port pmc1-taipan\
|
||||
host mc1-lyrebird\
|
||||
port pmc1-lyrebird\
|
||||
axis C\
|
||||
units mm\
|
||||
hardlowerlim -500\
|
||||
@@ -182,8 +182,8 @@ if $use_tiltstage {
|
||||
# mc1: Monochromator crystal selection rotation/Tilt
|
||||
Motor mtilt $motor_driver_type [params \
|
||||
asyncqueue mc1\
|
||||
host mc1-taipan\
|
||||
port pmc1-taipan\
|
||||
host mc1-lyrebird\
|
||||
port pmc1-lyrebird\
|
||||
axis A\
|
||||
units degrees\
|
||||
hardlowerlim -5\
|
||||
@@ -204,8 +204,8 @@ mtilt home 0
|
||||
# mc1: Monochromator Linear (Translate)
|
||||
Motor mtrans $motor_driver_type [params \
|
||||
asyncqueue mc1\
|
||||
host mc1-taipan\
|
||||
port pmc1-taipan\
|
||||
host mc1-lyrebird\
|
||||
port pmc1-lyrebird\
|
||||
axis B\
|
||||
units degrees\
|
||||
hardlowerlim -10\
|
||||
@@ -227,8 +227,8 @@ mtrans home 0
|
||||
# mc1: Fight Tube Rotate
|
||||
Motor m2 $motor_driver_type [params \
|
||||
asyncqueue mc1\
|
||||
host mc1-taipan\
|
||||
port pmc1-taipan\
|
||||
host mc1-lyrebird\
|
||||
port pmc1-lyrebird\
|
||||
axis F\
|
||||
units degrees\
|
||||
hardlowerlim -32.5\
|
||||
@@ -249,8 +249,8 @@ m2 home 0
|
||||
# mc1: Detector Rotate
|
||||
Motor a2 $motor_driver_type [params \
|
||||
asyncqueue mc1\
|
||||
host mc1-taipan\
|
||||
port pmc1-taipan\
|
||||
host mc1-lyrebird\
|
||||
port pmc1-lyrebird\
|
||||
axis H\
|
||||
units degrees\
|
||||
hardlowerlim -55\
|
||||
@@ -272,8 +272,8 @@ a2 home 0
|
||||
# mc2: Sample Tilt 1
|
||||
Motor sgu $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
host mc2-lyrebird\
|
||||
port pmc2-lyrebird\
|
||||
axis A\
|
||||
units degrees\
|
||||
hardlowerlim -18\
|
||||
@@ -294,8 +294,8 @@ sgu home 0
|
||||
# mc2: Sample Tilt 2
|
||||
Motor sgl $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
host mc2-lyrebird\
|
||||
port pmc2-lyrebird\
|
||||
axis B\
|
||||
units degrees\
|
||||
hardlowerlim -18\
|
||||
@@ -316,8 +316,8 @@ sgl home 0
|
||||
# mc2: Sample Up Tanslation
|
||||
Motor stu $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
host mc2-lyrebird\
|
||||
port pmc2-lyrebird\
|
||||
axis C\
|
||||
units degrees\
|
||||
hardlowerlim -15\
|
||||
@@ -338,8 +338,8 @@ stu home 0
|
||||
# mc2: Sample Lower Tanslation
|
||||
Motor stl $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
host mc2-lyrebird\
|
||||
port pmc2-lyrebird\
|
||||
axis D\
|
||||
units degrees\
|
||||
hardlowerlim -15\
|
||||
@@ -360,8 +360,8 @@ stl home 0
|
||||
# mc2: Sample Rotate
|
||||
Motor s1 $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
host mc2-lyrebird\
|
||||
port pmc2-lyrebird\
|
||||
axis E\
|
||||
units degrees\
|
||||
hardlowerlim -185\
|
||||
@@ -382,8 +382,8 @@ s1 home 0
|
||||
# mc2: Analyser Detector Rotate -- Sample Scattering Angle
|
||||
Motor s2 $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
host mc2-lyrebird\
|
||||
port pmc2-lyrebird\
|
||||
axis F\
|
||||
units degrees\
|
||||
hardlowerlim -128\
|
||||
@@ -404,8 +404,8 @@ s2 home 0
|
||||
# mc2: Analyser Horizontal Focus
|
||||
Motor ahfocus $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
host mc2-lyrebird\
|
||||
port pmc2-lyrebird\
|
||||
axis G\
|
||||
units degrees\
|
||||
hardlowerlim -360\
|
||||
@@ -426,8 +426,8 @@ ahfocus home 0
|
||||
# mc2: Analyser Vertical Focus
|
||||
Motor avfocus $motor_driver_type [params \
|
||||
asyncqueue mc2\
|
||||
host mc2-taipan\
|
||||
port pmc2-taipan\
|
||||
host mc2-lyrebird\
|
||||
port pmc2-lyrebird\
|
||||
axis H\
|
||||
units degrees\
|
||||
hardlowerlim -200\
|
||||
@@ -448,8 +448,8 @@ avfocus home 0
|
||||
# mc3: Monochromator Vertical Focus
|
||||
Motor mvfocus $motor_driver_type [params \
|
||||
asyncqueue mc3\
|
||||
host mc3-taipan\
|
||||
port pmc3-taipan\
|
||||
host mc3-lyrebird\
|
||||
port pmc3-lyrebird\
|
||||
axis A\
|
||||
units degrees\
|
||||
hardlowerlim 0\
|
||||
@@ -470,8 +470,8 @@ mvfocus home 0
|
||||
# mc3: Monochromator Horizontal Focus
|
||||
Motor mhfocus $motor_driver_type [params \
|
||||
asyncqueue mc3\
|
||||
host mc3-taipan\
|
||||
port pmc3-taipan\
|
||||
host mc3-lyrebird\
|
||||
port pmc3-lyrebird\
|
||||
axis B\
|
||||
units degrees\
|
||||
hardlowerlim -180\
|
||||
@@ -492,8 +492,8 @@ mhfocus home 0
|
||||
# mc3: Monochromator Rotate
|
||||
Motor m1 $motor_driver_type [params \
|
||||
asyncqueue mc3\
|
||||
host mc3-taipan\
|
||||
port pmc3-taipan\
|
||||
host mc3-lyrebird\
|
||||
port pmc3-lyrebird\
|
||||
axis E\
|
||||
units degrees\
|
||||
hardlowerlim 5\
|
||||
@@ -514,8 +514,8 @@ m1 home 0
|
||||
# mc4: Analyzer Tilt 1 -- Two-theta Angle
|
||||
Motor atilt $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
host mc4-taipan\
|
||||
port pmc4-taipan\
|
||||
host mc4-lyrebird\
|
||||
port pmc4-lyrebird\
|
||||
axis A\
|
||||
units degrees\
|
||||
hardlowerlim -5\
|
||||
@@ -536,8 +536,8 @@ atilt home 0
|
||||
# mc4: Analyzer Translate
|
||||
Motor atrans $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
host mc4-taipan\
|
||||
port pmc4-taipan\
|
||||
host mc4-lyrebird\
|
||||
port pmc4-lyrebird\
|
||||
axis C\
|
||||
units degrees\
|
||||
hardlowerlim -1\
|
||||
@@ -558,8 +558,8 @@ atrans home 0
|
||||
# mc4: Analyzer Rotate
|
||||
Motor a1 $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
host mc4-taipan\
|
||||
port pmc4-taipan\
|
||||
host mc4-lyrebird\
|
||||
port pmc4-lyrebird\
|
||||
axis D\
|
||||
units degrees\
|
||||
hardlowerlim -5.1\
|
||||
@@ -580,8 +580,8 @@ a1 home 0
|
||||
# mc4: Virtural Source Left Translation
|
||||
Motor VS_left $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
host mc4-taipan\
|
||||
port pmc4-taipan\
|
||||
host mc4-lyrebird\
|
||||
port pmc4-lyrebird\
|
||||
axis E\
|
||||
units mm\
|
||||
hardlowerlim 2\
|
||||
@@ -602,8 +602,8 @@ VS_left home 0
|
||||
# mc4: Virtural Source Right Translation
|
||||
Motor VS_right $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
host mc4-taipan\
|
||||
port pmc4-taipan\
|
||||
host mc4-lyrebird\
|
||||
port pmc4-lyrebird\
|
||||
axis F\
|
||||
units mm\
|
||||
hardlowerlim -35\
|
||||
@@ -624,8 +624,8 @@ VS_right home 0
|
||||
# mc4: Filter Rotate
|
||||
Motor mfilter $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
host mc4-taipan\
|
||||
port pmc4-taipan\
|
||||
host mc4-lyrebird\
|
||||
port pmc4-lyrebird\
|
||||
axis G\
|
||||
units degrees\
|
||||
hardlowerlim 0\
|
||||
@@ -646,8 +646,8 @@ mfilter home 0
|
||||
# mc4: Primary collimator Translate
|
||||
Motor collimator $motor_driver_type [params \
|
||||
asyncqueue mc4\
|
||||
host mc4-taipan\
|
||||
port pmc4-taipan\
|
||||
host mc4-lyrebird\
|
||||
port pmc4-lyrebird\
|
||||
axis H\
|
||||
units mm\
|
||||
hardlowerlim -112\
|
||||
@@ -668,8 +668,8 @@ mfilter home 0
|
||||
# mc6: Pre-sample right aperture -- Slit s1 right Blade
|
||||
Motor ps_right $motor_driver_type [params \
|
||||
asyncqueue mc6\
|
||||
host mc6-taipan\
|
||||
port pmc6-taipan\
|
||||
host mc6-lyrebird\
|
||||
port pmc6-lyrebird\
|
||||
axis A\
|
||||
units mm\
|
||||
hardlowerlim -27\
|
||||
@@ -690,8 +690,8 @@ ps_right home 0
|
||||
# mc6: Pre-sample left aperture -- Slit s1 left Blade
|
||||
Motor ps_left $motor_driver_type [params \
|
||||
asyncqueue mc6\
|
||||
host mc6-taipan\
|
||||
port pmc6-taipan\
|
||||
host mc6-lyrebird\
|
||||
port pmc6-lyrebird\
|
||||
axis B\
|
||||
units mm\
|
||||
hardlowerlim -27\
|
||||
@@ -712,8 +712,8 @@ ps_left home 0
|
||||
# mc6: Pre-sample top aperture -- Slit s1 top Blade
|
||||
Motor ps_top $motor_driver_type [params \
|
||||
asyncqueue mc6\
|
||||
host mc6-taipan\
|
||||
port pmc6-taipan\
|
||||
host mc6-lyrebird\
|
||||
port pmc6-lyrebird\
|
||||
axis C\
|
||||
units mm\
|
||||
hardlowerlim -200\
|
||||
@@ -734,8 +734,8 @@ ps_top home 0
|
||||
# mc6: Pre-sample bottom aperture -- Slit s1 bottom Blade
|
||||
Motor ps_bottom $motor_driver_type [params \
|
||||
asyncqueue mc6\
|
||||
host mc6-taipan\
|
||||
port pmc6-taipan\
|
||||
host mc6-lyrebird\
|
||||
port pmc6-lyrebird\
|
||||
axis D\
|
||||
units mm\
|
||||
hardlowerlim -200\
|
||||
@@ -756,8 +756,8 @@ ps_bottom home 0
|
||||
# mc6: Pre-sample right aperture -- Slit s2 right Blade
|
||||
Motor pa_right $motor_driver_type [params \
|
||||
asyncqueue mc6\
|
||||
host mc6-taipan\
|
||||
port pmc6-taipan\
|
||||
host mc6-lyrebird\
|
||||
port pmc6-lyrebird\
|
||||
axis E\
|
||||
units mm\
|
||||
hardlowerlim -26\
|
||||
@@ -778,8 +778,8 @@ pa_right home 0
|
||||
# mc6: Pre-sample left aperture -- Slit s2 left Blade
|
||||
Motor pa_left $motor_driver_type [params \
|
||||
asyncqueue mc6\
|
||||
host mc6-taipan\
|
||||
port pmc6-taipan\
|
||||
host mc6-lyrebird\
|
||||
port pmc6-lyrebird\
|
||||
axis F\
|
||||
units mm\
|
||||
hardlowerlim -26\
|
||||
@@ -800,8 +800,8 @@ pa_left home 0
|
||||
# mc6: Pre-sample top aperture -- Slit s2 top Blade
|
||||
Motor pa_top $motor_driver_type [params \
|
||||
asyncqueue mc6\
|
||||
host mc6-taipan\
|
||||
port pmc6-taipan\
|
||||
host mc6-lyrebird\
|
||||
port pmc6-lyrebird\
|
||||
axis G\
|
||||
units mm\
|
||||
hardlowerlim -200\
|
||||
@@ -822,8 +822,8 @@ pa_left home 0
|
||||
# mc6: Pre-sample bottom aperture -- Slit s2 bottom Blade
|
||||
Motor pa_bottom $motor_driver_type [params \
|
||||
asyncqueue mc6\
|
||||
host mc6-taipan\
|
||||
port pmc6-taipan\
|
||||
host mc6-lyrebird\
|
||||
port pmc6-lyrebird\
|
||||
axis H\
|
||||
units mm\
|
||||
hardlowerlim -200\
|
||||
|
||||
@@ -67,8 +67,6 @@ proc ::scobj::galil::mkGalil {argList} {
|
||||
set sim_mode [SplitReply [motor_simulation]]
|
||||
#set sim_mode "false"
|
||||
|
||||
puts "sim_mode=$sim_mode"
|
||||
|
||||
MakeSICSObj $batObjName SCT_OBJECT
|
||||
|
||||
# Set hipadaba properties for GumTree interface
|
||||
@@ -93,7 +91,6 @@ proc ::scobj::galil::mkGalil {argList} {
|
||||
|
||||
::scobj::hinitprops $batObjName setAngle Angle
|
||||
|
||||
puts "batpath : $batpath"
|
||||
sct_ft poll $batpath $internal
|
||||
sct_ft write $batpath
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
Author: jgn@ansto.gov.au
|
||||
#Author: jgn@ansto.gov.au
|
||||
|
||||
fileeval $cfPath(motors)/sct_flightTube.tcl
|
||||
|
||||
|
||||
Reference in New Issue
Block a user