Merged 2.4 branch

r2828 | ffr | 2009-11-25 09:56:49 +1100 (Wed, 25 Nov 2009) | 2 lines
This commit is contained in:
Ferdi Franceschini
2009-11-25 09:56:49 +11:00
committed by Douglas Clowes
parent c58ee9fbcb
commit 2ec6505ef8
71 changed files with 2237 additions and 1528 deletions

View File

@@ -1,20 +1,48 @@
puts "velsel.tcl NOT YET AVAILABLE"
if 0 {
set velsel_controller(host) 137.157.202.70
set velsel_controller(port) 10000
set velsel_controller(user) NVS
set velsel_controller(password) NVS
set currVelSel "two"
namespace eval ::scobj::velocity_selector {
variable blocked_speeds
variable velsel_IP
variable velsel_port
# Velocity Selector
MakeTCPSelector velsel [params \
Host $velsel_controller(host) \
Port $velsel_controller(port) \
User $velsel_controller(user) \
Password $velsel_controller(password) \
]
velsel add 3600 4900
velsel add 7800 10500
velsel add 30000 30000
set ::currVelSel [string tolower $::currVelSel]
switch $::currVelSel {
"one" {
set velsel_IP "137.157.202.73"
set velsel_port 10000
set m_dTwistAngle 48.30
set m_dLength 0.250
set m_iMaxSpeed 28300.0
set rBeamCenter 0.110
set ::scobj::velocity_selector::UID "NVS"
set ::scobj::velocity_selector::PWD "NVS"
set VNeutron 3955.98
set ::scobj::velocity_selector::blocked_speeds {
-inf 3099
3600 4999
7800 10599
28301 inf
}
}
"two" {
# dc2-quokka.nbi.ansto.gov.au
set velsel_IP "137.157.202.74"
set velsel_port 10000
set m_dTwistAngle 37.6
set m_dLength 0.250
set m_iMaxSpeed 21500.0
set rBeamCenter 0.1170
set VNeutron 3955.98
set ::scobj::velocity_selector::UID "NVS"
set ::scobj::velocity_selector::PWD "NVS"
set ::scobj::velocity_selector::blocked_speeds {
-inf 3099
3600 4999
7800 9699
21500 inf
}
}
}
}
source $cfPath(velsel)/sct_velsel.tcl