linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The two_theta configurable motor may have been made obsolete by the commands.tcl:omega_2theta command.

Browse Source 
r2680 | ffr | 2008-08-26 09:09:50 +1000 (Tue, 26 Aug 2008) | 2 lines
This commit is contained in:
Ferdi Franceschini
2008-08-26 09:09:50 +10:00
committed by Douglas Clowes
parent 165f1b90a4
commit 06a18bc86d
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
View File

@@ -902,29 +902,31 @@ make_gap_motors ss3hg gap ss3ho offset ss3r ss3l mm $slit3HGroup
make_gap_motors ss4vg gap ss4vo offset ss4u ss4d mm $slit4VGroup
make_gap_motors ss4hg gap ss4ho offset ss4r ss4l mm $slit4HGroup
proc ds_set_two_theta { arg } {
set rad [expr ($arg/180.0)*3.1415926535897932384626433832795]
set d1 [expr [SplitReply [detector_distance]] - [SplitReply [sample_distance]]]
set d2 [expr [SplitReply [slit4_distance]] - [SplitReply [sample_distance]]]
set h1 [expr [SplitReply [detector_base]] + $d1 * tan($rad)]
set h2 [expr [SplitReply [slit4_base]] + $d2 * tan($rad)]
return "dz=$h1,st4vt=$h2"
}
publish ds_set_two_theta user
proc rs_get_two_theta {} {
set d1 [expr [SplitReply [detector_distance]] - [SplitReply [sample_distance]]]
set h1 [expr [SplitReply [dz]] - [SplitReply [detector_base]]]
return [expr (180.0*atan2($h1, $d1))/3.1415926535897932384626433832795]
}
publish rs_get_two_theta user
MakeConfigurableMotor two_theta
two_theta readscript rs_get_two_theta
two_theta drivescript ds_set_two_theta
sicslist setatt two_theta klass sample
sicslist setatt two_theta long_name two_theta
sicslist setatt two_theta units degrees
# The configurable two_theta motor may have been made obsolete
# by the commands.tcl:omega_2theta command 26/8/08
#proc ds_set_two_theta { arg } {
# set rad [expr ($arg/180.0)*3.1415926535897932384626433832795]
# set d1 [expr [SplitReply [detector_distance]] - [SplitReply [sample_distance]]]
# set d2 [expr [SplitReply [slit4_distance]] - [SplitReply [sample_distance]]]
# set h1 [expr [SplitReply [detector_base]] + $d1 * tan($rad)]
# set h2 [expr [SplitReply [slit4_base]] + $d2 * tan($rad)]
# return "dz=$h1,st4vt=$h2"
#}
#publish ds_set_two_theta user
#
#proc rs_get_two_theta {} {
# set d1 [expr [SplitReply [detector_distance]] - [SplitReply [sample_distance]]]
# set h1 [expr [SplitReply [dz]] - [SplitReply [detector_base]]]
# return [expr (180.0*atan2($h1, $d1))/3.1415926535897932384626433832795]
#}
#publish rs_get_two_theta user
#
#MakeConfigurableMotor two_theta
#two_theta readscript rs_get_two_theta
#two_theta drivescript ds_set_two_theta
#sicslist setatt two_theta klass sample
#sicslist setatt two_theta long_name two_theta
#sicslist setatt two_theta units degrees
proc motor_set_sobj_attributes {} {
}