From 731c83786b6428fdc7eeeafbb19912db978e2677 Mon Sep 17 00:00:00 2001 From: Jing Chen Date: Wed, 24 Oct 2012 15:12:20 +1100 Subject: [PATCH] change magneticFieldCurernt to magneticFieldCurrent r3771 | jgn | 2012-10-24 15:12:20 +1100 (Wed, 24 Oct 2012) | 1 line --- .../magneticField/sct_oxford_labview.tcl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 1cb7dfa1..52f96d1b 100644 --- a/site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl +++ b/site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl @@ -131,7 +131,7 @@ proc ::scobj::magnetic::rdFieldStateFunc {basePath} { set s1 [string trimright $replyStr "\n"] set s2 [split $s1 "=;"] array set paraArr $s2 - hset $basePath/magneticFieldCurernt $paraArr(Field_Current) + hset $basePath/magneticFieldCurrent $paraArr(Field_Current) hset $basePath/magneticFieldTesla $paraArr(Field_Tesla) } @@ -245,7 +245,7 @@ proc ::scobj::magnetic::mkMagnetic {argList} { set hPath /sics/$pa(NAME) hfactory $hPath/field plain user text - hfactory $hPath/magneticFieldCurernt plain user float + hfactory $hPath/magneticFieldCurrent plain user float hfactory $hPath/magneticFieldTesla plain user float hfactory $hPath/start_magnetic plain user float @@ -270,7 +270,7 @@ proc ::scobj::magnetic::mkMagnetic {argList} { hfactory $hPath/fieldSetRate plain user float # this three values will be upadted immediately by the current readings in the system - hset $hPath/magneticFieldCurernt 10 + hset $hPath/magneticFieldCurrent 10 hset $hPath/magneticFieldTesla 10 hset $hPath/fieldSetPoint 0 @@ -306,7 +306,7 @@ proc ::scobj::magnetic::mkMagnetic {argList} { /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/magneticFieldCurernt NXsensor true true true true user magnetic_Field_Current + /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 @@ -325,7 +325,7 @@ proc ::scobj::magnetic::mkMagnetic {argList} { ::scobj::hinitprops $pa(NAME) # proc ::histogram_memory::pre_count "{fPath $pa(NAME)}" { -# hset /sics/$fPath/start_magnetic [hval /sics/$fPath/magneticFieldCurernt] +# hset /sics/$fPath/start_magnetic [hval /sics/$fPath/magneticFieldCurrent] # hset /sics/$fPath/start_temperature_s1 [hval /sics/$fPath/Temp_s1] # hset /sics/$fPath/start_temperature_s2 [hval /sics/$fPath/Temp_s2] @@ -333,7 +333,7 @@ proc ::scobj::magnetic::mkMagnetic {argList} { # } # proc ::histogram_memory::post_count "{fPath $pa(NAME)}" { -# hset /sics/$fPath/end_magnetic [hval /sics/$fPath/magneticFieldCurernt] +# hset /sics/$fPath/end_magnetic [hval /sics/$fPath/magneticFieldCurrent] # hset /sics/$fPath/end_temperature_s1 [hval /sics/$fPath/Temp_s1] # hset /sics/$fPath/end_temperature_s2 [hval /sics/$fPath/Temp_s2] @@ -414,12 +414,12 @@ proc OxfordSetField {{setPoint ""} {mode ""} args} { } #set num 0 - #while { $num <= 40 && [expr abs([hval /sics/$NAME/fieldSetPoint] - [hval /sics/$NAME/magneticFieldCurernt]) ] >= 0.001 } { - # broadcast "Magnetic field being set to [hval /sics/$NAME/magneticFieldCurernt] now ......" + #while { $num <= 40 && [expr abs([hval /sics/$NAME/fieldSetPoint] - [hval /sics/$NAME/magneticFieldCurrent]) ] >= 0.001 } { + # broadcast "Magnetic field being set to [hval /sics/$NAME/magneticFieldCurrent] now ......" # after 500 # set num [expr $num + 1] #} - #broadcast "Done, Magnetic field set to [hval /sics/$NAME/magneticFieldCurernt]" + #broadcast "Done, Magnetic field set to [hval /sics/$NAME/magneticFieldCurrent]" } }