From be653c91fe51d50e3e853dfc2f653379dc5bae72 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 1 May 2014 09:18:55 +1000 Subject: [PATCH] Make instrument specific Oxford configs consistent for Quokka and Taipan. --- .../config/environment/magneticField/oxford_labview.tcl | 5 ----- .../config/environment/magneticField/oxford_labview.tcl | 8 -------- 2 files changed, 13 deletions(-) diff --git a/site_ansto/instrument/sans/config/environment/magneticField/oxford_labview.tcl b/site_ansto/instrument/sans/config/environment/magneticField/oxford_labview.tcl index 78d0ab18..424b9677 100644 --- a/site_ansto/instrument/sans/config/environment/magneticField/oxford_labview.tcl +++ b/site_ansto/instrument/sans/config/environment/magneticField/oxford_labview.tcl @@ -1,6 +1 @@ fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl - -# PORT 55001 -# Eg Make a magnet driver called magnet which polls every 10 seconds -# add_oxmag magnet 10.157.205.3 55001 10 - diff --git a/site_ansto/instrument/tas/config/environment/magneticField/oxford_labview.tcl b/site_ansto/instrument/tas/config/environment/magneticField/oxford_labview.tcl index 49692b8f..424b9677 100644 --- a/site_ansto/instrument/tas/config/environment/magneticField/oxford_labview.tcl +++ b/site_ansto/instrument/tas/config/environment/magneticField/oxford_labview.tcl @@ -1,9 +1 @@ fileeval $cfPath(environment)/magneticField/sct_oxford_labview.tcl - -if { [ info exists ::config_dict ] && [ dict get $::config_dict 12tmagnet enabled ] } { - set IP [dict get $::config_dict 12tmagnet ip] - set PORT [dict get $::config_dict 12tmagnet port] - set NAME [dict get $::config_dict 12tmagnet name] - puts "MAGNET: add_oxmag $NAME $IP $PORT" - add_oxmag $NAME $IP $PORT -}