linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use configured magnet name in OxfordSet commands.

Browse Source 
Also T3 is really pressure.
This commit is contained in:
Ferdi Franceschini
2014-08-08 11:50:26 +10:00
parent 944902c9d4
commit 13003126a6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
site_ansto/instrument/config/environment/magneticField/sct_oxford_labview.tcl
View File

@ -181,7 +181,7 @@ proc ::scobj::magnetic::rdTempStateFunc {basePath field} {
array set paraArr $s2 array set paraArr $s2
hset $basePath/Temp_s1 $paraArr(T1) hset $basePath/Temp_s1 $paraArr(T1)
hset $basePath/Temp_s2 $paraArr(T2) hset $basePath/Temp_s2 $paraArr(T2)
hset $basePath/Temp_s3 $paraArr(T3) hset $basePath/Pressure_s3 $paraArr(T3)
set logText "Displayed Temp : $paraArr(T1) $paraArr(T2) $paraArr(T3)" set logText "Displayed Temp : $paraArr(T1) $paraArr(T2) $paraArr(T3)"
} }
@ -254,7 +254,7 @@ proc ::scobj::magnetic::mkMagnetic {argList} {
hfactory $hPath/Temp plain user text hfactory $hPath/Temp plain user text
hfactory $hPath/Temp_s1 plain user float hfactory $hPath/Temp_s1 plain user float
hfactory $hPath/Temp_s2 plain user float hfactory $hPath/Temp_s2 plain user float
hfactory $hPath/Temp_s3 plain user float hfactory $hPath/Pressure_s3 plain user float
#hfactory $hPath/Set_Sensor_Temp user float #hfactory $hPath/Set_Sensor_Temp user float
#hfactory $hPath/Set_Sensor_Channel user int #hfactory $hPath/Set_Sensor_Channel user int
@ -305,7 +305,7 @@ proc ::scobj::magnetic::mkMagnetic {argList} {
foreach {hdbPath klass control data nxsave mutable priv alias} [subst { 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_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_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)/Pressure_s3 NXsensor true true true true user magnetic_P3
/sics/$pa(NAME)/magneticFieldCurrent NXsensor true true true true user magnetic_Field_Current /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)/magneticFieldTesla NXsensor true true true true user magnetic_Field_Tesla
/sics/$pa(NAME)/fieldSetPoint NXsensor true true true true user fieldSetPoint /sics/$pa(NAME)/fieldSetPoint NXsensor true true true true user fieldSetPoint
@ -330,7 +330,7 @@ proc ::scobj::magnetic::mkMagnetic {argList} {
# hset /sics/$fPath/start_temperature_s1 [hval /sics/$fPath/Temp_s1] # hset /sics/$fPath/start_temperature_s1 [hval /sics/$fPath/Temp_s1]
# hset /sics/$fPath/start_temperature_s2 [hval /sics/$fPath/Temp_s2] # hset /sics/$fPath/start_temperature_s2 [hval /sics/$fPath/Temp_s2]
# hset /sics/$fPath/start_temperature_s3 [hval /sics/$fPath/Temp_s3] # hset /sics/$fPath/start_temperature_s3 [hval /sics/$fPath/Pressure_s3]
# } # }
# proc ::histogram_memory::post_count "{fPath $pa(NAME)}" { # proc ::histogram_memory::post_count "{fPath $pa(NAME)}" {
@ -338,10 +338,11 @@ proc ::scobj::magnetic::mkMagnetic {argList} {
# hset /sics/$fPath/end_temperature_s1 [hval /sics/$fPath/Temp_s1] # hset /sics/$fPath/end_temperature_s1 [hval /sics/$fPath/Temp_s1]
# hset /sics/$fPath/end_temperature_s2 [hval /sics/$fPath/Temp_s2] # hset /sics/$fPath/end_temperature_s2 [hval /sics/$fPath/Temp_s2]
# hset /sics/$fPath/end_temperature_s3 [hval /sics/$fPath/Temp_s3] # hset /sics/$fPath/end_temperature_s3 [hval /sics/$fPath/Pressure_s3]
# } # }
set ::scobj::magnetic::sct_name $pa(SCTCONTROLLER) set ::scobj::magnetic::sct_name $pa(SCTCONTROLLER)
set ::scobj::magnetic::magname $pa(NAME)
hsetprop $hPath/field read ::scobj::magnetic::rqFieldFunc hsetprop $hPath/field read ::scobj::magnetic::rqFieldFunc
hsetprop $hPath/field rdFieldState ::scobj::magnetic::rdFieldStateFunc $hPath hsetprop $hPath/field rdFieldState ::scobj::magnetic::rdFieldStateFunc $hPath
@ -393,7 +394,7 @@ proc ::scobj::magnetic::mkMagnetic {argList} {
# command is : OxfordSetField fieldValue P ; where "P" is an optinal parameter and if set will change # command is : OxfordSetField fieldValue P ; where "P" is an optinal parameter and if set will change
# to posistent mode after changig the magnetic field # to posistent mode after changig the magnetic field
proc OxfordSetField {{setPoint ""} {mode ""} args} { proc OxfordSetField {{setPoint ""} {mode ""} args} {
set NAME "magnetic" set NAME $::scobj::magnetic::magname
if {$setPoint == ""} { if {$setPoint == ""} {
if {$mode == ""} { if {$mode == ""} {
broadcast "[hget /sample/$NAME/fieldSetPoint]" broadcast "[hget /sample/$NAME/fieldSetPoint]"
@ -428,7 +429,7 @@ proc OxfordSetField {{setPoint ""} {mode ""} args} {
# Assign the rate of the changing magnetic field; # Assign the rate of the changing magnetic field;
# This needs only to be set once unless required # This needs only to be set once unless required
proc OxfordSetRate {{setRate ""} args} { proc OxfordSetRate {{setRate ""} args} {
set NAME "magnetic" set NAME $::scobj::magnetic::magname
if {$setRate == ""} { if {$setRate == ""} {
broadcast "[hget /sample/$NAME/fieldSetRate]" broadcast "[hget /sample/$NAME/fieldSetRate]"
} else { } else {
@ -441,7 +442,7 @@ proc OxfordSetRate {{setRate ""} args} {
# Querying/Setting the Heliox sample temperature # Querying/Setting the Heliox sample temperature
proc OxfordSetHTemp {{temp ""} args} { proc OxfordSetHTemp {{temp ""} args} {
set NAME "magnetic" set NAME $::scobj::magnetic::magname
if {$temp == ""} { if {$temp == ""} {
broadcast "[hget /sample/$NAME/HelioxTempSetPoint]" broadcast "[hget /sample/$NAME/HelioxTempSetPoint]"
} else { } else {
@ -462,7 +463,7 @@ proc OxfordSetHTemp {{temp ""} args} {
# Querying/Setting the Diluxtion Sample temperature # Querying/Setting the Diluxtion Sample temperature
proc OxfordSetDTemp {{temp ""} args} { proc OxfordSetDTemp {{temp ""} args} {
set NAME "magnetic" set NAME $::scobj::magnetic::magname
if {$temp == ""} { if {$temp == ""} {
broadcast "[hget /sample/$NAME/DilutTempSetPoint]" broadcast "[hget /sample/$NAME/DilutTempSetPoint]"
} else { } else {