Merged in-situ modifications for Release 2.5 candidate 5

r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines

site_ansto/instrument/hrpd/config/environment/robby_configuration.tcl

@@ -3,7 +3,7 @@ namespace eval robot {
 		MakeAsyncProtocol robot
 		MakeAsyncQueue robby robot 137.157.201.26 6000
 		robby delay 500
-		robby timeout 5000
+		robby timeout 50000
 		drive sx 0 sy 0 som 0
 	}
 }

site_ansto/instrument/hrpd/config/hmm/hmm_configuration.tcl

@@ -165,8 +165,8 @@ proc ::histogram_memory::isc_initialize {} {
     ::histogram_memory::init_CAT_TABLE
     ::histogram_memory::upload_config Filler_defaults
 
-    ::nexus::data alias ::histogram_memory::vertical_axis ::histogram_memory::y_pixel_offset
-    ::nexus::data alias ::histogram_memory::horizontal_axis ::histogram_memory::x_pixel_angular_offset
+    set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_angular_offset
+    set ::histogram_memory::histmem_axes(VER) /instrument/detector/y_pixel_offset
   } message ] {
     if {$::errorCode=="NONE"} {return $message}
     return -code error $message

site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl

@@ -539,8 +539,8 @@ ss1r softlowerlim $ss1r_LoRange
 ss1r softupperlim $ss1r_HiRange
 ss1r home 0
 ss1r movecount $move_count
-ss1r part slits.first
-ss1r long_name right
+ss1r part slits
+ss1r long_name first_right
 
 # Slit 1, left
 Motor ss1l $motor_driver_type [params \
@@ -558,8 +558,8 @@ ss1l softlowerlim $ss1l_LoRange
 ss1l softupperlim $ss1l_HiRange
 ss1l home 0
 ss1l movecount $move_count
-ss1l part slits.first
-ss1l long_name left
+ss1l part slits
+ss1l long_name first_left
 
 # Slit 1, up
 Motor ss1u $motor_driver_type [params \
@@ -577,8 +577,8 @@ ss1u softlowerlim $ss1u_LoRange
 ss1u softupperlim $ss1u_HiRange
 ss1u home 0
 ss1u movecount $move_count
-ss1u part slits.first
-ss1u long_name top
+ss1u part slits
+ss1u long_name first_top
 
 # Slit 1, down
 Motor ss1d $motor_driver_type [params \
@@ -596,8 +596,8 @@ ss1d softlowerlim $ss1d_LoRange
 ss1d softupperlim $ss1d_HiRange
 ss1d home 0
 ss1d movecount $move_count
-ss1d part slits.first
-ss1d long_name bottom
+ss1d part slits
+ss1d long_name first_bottom
 
 ############################
 # Motor Controller 4
@@ -650,8 +650,8 @@ ss2r softlowerlim $ss2r_LoRange
 ss2r softupperlim $ss2r_HiRange
 ss2r home 0
 ss2r movecount $move_count
-ss2r part slits.second
-ss2r long_name right
+ss2r part slits
+ss2r long_name second_right
 
 # Slit 2, left
 Motor ss2l $motor_driver_type [params \
@@ -669,8 +669,8 @@ ss2l softlowerlim $ss2l_LoRange
 ss2l softupperlim $ss2l_HiRange
 ss2l home 0
 ss2l movecount $move_count
-ss2l part slits.second
-ss2l long_name left
+ss2l part slits
+ss2l long_name second_left
 
 # Slit 2, up
 Motor ss2u $motor_driver_type [params \
@@ -688,8 +688,8 @@ ss2u softlowerlim $ss2u_LoRange
 ss2u softupperlim $ss2u_HiRange
 ss2u home 0
 ss2u movecount $move_count
-ss2u part slits.second
-ss2u long_name top
+ss2u part slits
+ss2u long_name second_top
 
 # Slit 2, down
 Motor ss2d $motor_driver_type [params \
@@ -707,8 +707,8 @@ ss2d softlowerlim $ss2d_LoRange
 ss2d softupperlim $ss2d_HiRange
 ss2d home 0
 ss2d movecount $move_count
-ss2d part slits.second
-ss2d long_name bottom
+ss2d part slits
+ss2d long_name second_bottom
 
 # Virtual and Simulated Motors
 # ----------------------------