diff --git a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl index b9bd8dce..51efa948 100644 --- a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl @@ -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 {} { }