From d4b782aae7fcc8a308dbdba662344b78572beddb Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Tue, 15 Oct 2013 03:23:10 +1100 Subject: [PATCH] Remove hard coded magnet name from sensor path. --- .../magneticField/sct_oxford_labview.tcl | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl b/site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl index 6d01544a..8cb9b798 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl @@ -302,15 +302,15 @@ proc ::scobj::magnetic::mkMagnetic {argList} { hsetprop $hPath control true hsetprop $hPath data true - foreach {hdbPath klass control data nxsave mutable priv alias} { - /sics/magnetic/Temp_s1 NXsensor true true true true user magnetic_T1 - /sics/magnetic/Temp_s2 NXsensor true true true true user magnetic_T2 - /sics/magnetic/Temp_s3 NXsensor true true true true user magnetic_T3 - /sics/magnetic/magneticFieldCurrent NXsensor true true true true user magnetic_Field_Current - /sics/magnetic/magneticFieldTesla NXsensor true true true true user magnetic_Field_Tesla - /sics/magnetic/HelioxTempReading NXsensor true true true true user magnetic_Heliox_Temp - /sics/magnetic/DilutTempReading NXsensor true true true true user magnetic_Dilut_Temp - } { + foreach {hdbPath klass control data nxsave mutable priv alias} [subst { + /sics/$pa(NAME)/Temp_s1 NXsensor true true true true user magnetic_T1 + /sics/$pa(NAME)/Temp_s2 NXsensor true true true true user magnetic_T2 + /sics/$pa(NAME)/Temp_s3 NXsensor true true true true user magnetic_T3 + /sics/$pa(NAME)/magneticFieldCurrent NXsensor true true true true user magnetic_Field_Current + /sics/$pa(NAME)/magneticFieldTesla NXsensor true true true true user magnetic_Field_Tesla + /sics/$pa(NAME)/HelioxTempReading NXsensor true true true true user magnetic_Heliox_Temp + /sics/$pa(NAME)/DilutTempReading NXsensor true true true true user magnetic_Dilut_Temp + }] { hsetprop $hdbPath nxalias $alias hsetprop $hdbPath klass $klass hsetprop $hdbPath privilege $priv @@ -498,7 +498,7 @@ proc add_oxmag { name IP PORT {interval 5} } { name $name IP $IP PORT $PORT - tuning 0 + tuning 1 interval $interval }] }