sct_julabo_lh45.tcl

Create object when in simulation mode

nxscripts_common_1.tcl
Set units attributes on script context objects data

sans aperture_configuration.tcl
Update rotary attenuator lookup table. Set parameters when motors positions are
within tolerance of the lookup table positions.

sans, parameters.tcl sct_velsel.tcl
Set units and update parameter names to be consistent

quokka_configuration.tcl
Add convenience command to load environment controllers.

server_config.tcl
Make sure that controllers are properly generated when loading them from the ext
raconfig.tcl.

r2881 | ffr | 2010-01-29 16:50:51 +1100 (Fri, 29 Jan 2010) | 20 lines

site_ansto/instrument/sans/config/optics/aperture_configuration.tcl

@@ -1,16 +1,16 @@
 namespace eval optics {
   array set AttRotLookupTable {
     0     0.0
-    30    1.5
-    60    3.4
+    30    1.3
+    60    3.3
     90    4.9
     120   6.4
     150   8.3
-    180   9.8
+    180   9.6
     210  11.2
-    240  13.2
-    270  18.1
-    300  23.0
+    240  13.1
+    270  15.0
+    300  18.0
     330  25.0
   }
 
@@ -30,11 +30,11 @@ namespace eval optics {
   }
 }
 
-proc ::optics::AttRotLookup {angle} {
+proc ::optics::AttRotLookup {angle tol} {
 	variable AttRotLookupTable
 	set foundit false
 	foreach vangle [array names AttRotLookupTable] {
-		if {$vangle == [expr int($angle)]} {
+		if {$vangle >= [expr {$angle-$tol}] && $vangle <= [expr {$angle+$tol}]} {
 			set foundit true
 			break
 		}
@@ -46,7 +46,7 @@ proc ::optics::AttRotLookup {angle} {
 	}
 }
 
-proc ::optics::EApLookUp {angle param} {
+proc ::optics::EApLookUp {angle param tol} {
 	variable EApLookupTable
 
 	set foundit false
@@ -65,7 +65,7 @@ proc ::optics::EApLookUp {angle param} {
 		 }
 	}
 	foreach vangle [array names EApLookupTable] {
-		if {$vangle == [expr int($angle)]} {
+		if {$vangle >= [expr {$angle-$tol}] && $vangle <= [expr {$angle+$tol}]} {
 			set foundit true
 			break
 		}