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
This commit is contained in:
Ferdi Franceschini
2010-04-29 16:02:15 +10:00
committed by Douglas Clowes
parent a2ca46ab67
commit e6e3c3be52
24 changed files with 478 additions and 363 deletions

View File

@@ -38,9 +38,9 @@ source gumxml.tcl
::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false
::anticollider::protect_detector "true"
# Driver for Bruker BEC1 power supply (1-Tesla Magnet) - beta
# Driver for Bruker BEC1 power supply (1-Tesla Magnet)
# driver short-name IP-address MoxaPort Tolerance(Amps)
#add_bruker_BEC1 ma1 137.157.202.145 4003 0.1
#add_bruker_BEC1 ma1 137.157.202.152 4444 0.1
server_init
###########################################