From d99d9cc7ee459a1d72d0212310651321ef517e0d Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Tue, 19 Jun 2012 20:42:15 +1000 Subject: [PATCH] SICS-435: Save setpoint in data file. r3612 | ffr | 2012-06-19 20:42:15 +1000 (Tue, 19 Jun 2012) | 2 lines --- .../temperature/sct_lakeshore_336.tcl | 31 +++---------------- .../temperature/sct_lakeshore_340.tcl | 31 +++---------------- 2 files changed, 10 insertions(+), 52 deletions(-) diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl index eecffa49..f2253758 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_336.tcl @@ -1799,37 +1799,13 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p $scobj_hpath sensor/Tsample sensor user $scobj_hpath sensor/ctrlLp1_value sensor user $scobj_hpath sensor/ctrlLp2_value sensor user - $scobj_hpath sensor/timStamp sensor user $scobj_hpath sensor/sensorValueA sensor user $scobj_hpath sensor/sensorValueB sensor user $scobj_hpath sensor/sensorValueC sensor user $scobj_hpath sensor/sensorValueD sensor user + $scobj_hpath sensor/setpoint1 sensor user + $scobj_hpath sensor/setpoint2 sensor user " - set aliasProperties " - $scobj_hpath Tsample sensor _sensor_Tsample - $scobj_hpath ctrlLp1_value sensor _sensor_ctrlLp1_value - $scobj_hpath ctrlLp2_value sensor _sensor_ctrlLp2_value - $scobj_hpath timStamp sensor _sensor_timStamp - $scobj_hpath sensorValueA sensor _sensor_sensorValueA - $scobj_hpath sensorValueB sensor _sensor_sensorValueB - $scobj_hpath sensorValueC sensor _sensor_sensorValueC - $scobj_hpath sensorValueD sensor _sensor_sensorValueD - " - # from nexus.dic file - # tc1_sensor_Tsample = /entry1,NXentry/sample,NXsample/tc1,NXenvironment/sensor,NXsensor/SDS Tsample -type NX_FLOAT32 -rank 1 -dim {-1} - # tc1_sensor_value = /entry1,NXentry/sample,NXsample/tc1,NXenvironment/sensor,NXsensor/SDS ctrlLp1_value -type NX_FLOAT32 -rank 1 -dim {-1} - # $scobj_hpath sensor/sampleSensor sensor user - set nxProperties " - $scobj_hpath sensor NXsensor spy - $scobj_hpath sensor/Tsample sensor user - $scobj_hpath sensor/ctrlLp1_value sensor user - $scobj_hpath sensor/ctrlLp2_value sensor user - $scobj_hpath sensor/sensorValueA sensor user - $scobj_hpath sensor/sensorValueB sensor user - $scobj_hpath sensor/sensorValueC sensor user - $scobj_hpath sensor/sensorValueD sensor user - " - # $scobj_hpath sampleSensor _sensor_sampleSensor set aliasProperties " $scobj_hpath Tsample sensor _sensor_Tsample $scobj_hpath ctrlLp1_value sensor _sensor_ctrlLp1_value @@ -1838,7 +1814,10 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p $scobj_hpath sensorValueB sensor _sensor_sensorValueB $scobj_hpath sensorValueC sensor _sensor_sensorValueC $scobj_hpath sensorValueD sensor _sensor_sensorValueD + $scobj_hpath setpoint1 sensor _setpoint1 + $scobj_hpath setpoint2 sensor _setpoint2 " + foreach {rootpath hpath klasse priv} $nxProperties { hsetprop $rootpath/$hpath klass $klasse hsetprop $rootpath/$hpath privilege $priv diff --git a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl index 6d01356b..d514cfe2 100644 --- a/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl +++ b/site_ansto/instrument/config/environment/temperature/sct_lakeshore_340.tcl @@ -2006,6 +2006,8 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p $scobj_hpath sensor/sensorValueB sensor user $scobj_hpath sensor/sensorValueC sensor user $scobj_hpath sensor/sensorValueD sensor user + $scobj_hpath sensor/setpoint1 sensor user + $scobj_hpath sensor/setpoint2 sensor user " set aliasProperties " $scobj_hpath Tsample sensor _sensor_Tsample @@ -2016,33 +2018,10 @@ proc createNode {scobj_hpath sct_controller cmdGroup varName readable writable p $scobj_hpath sensorValueB sensor _sensor_sensorValueB $scobj_hpath sensorValueC sensor _sensor_sensorValueC $scobj_hpath sensorValueD sensor _sensor_sensorValueD + $scobj_hpath setpoint1 sensor _setpoint1 + $scobj_hpath setpoint2 sensor _setpoint2 " - # from nexus.dic file - # tc1_sensor_Tsample = /entry1,NXentry/sample,NXsample/tc1,NXenvironment/sensor,NXsensor/SDS Tsample -type NX_FLOAT32 -rank 1 -dim {-1} - # tc1_sensor_value = /entry1,NXentry/sample,NXsample/tc1,NXenvironment/sensor,NXsensor/SDS ctrlLp1_value -type NX_FLOAT32 -rank 1 -dim {-1} - if { $::scobj::ls340::ls340_LSmodel == 336 } { - # $scobj_hpath sensor/sampleSensor sensor user - set nxProperties " - $scobj_hpath sensor NXsensor spy - $scobj_hpath sensor/Tsample sensor user - $scobj_hpath sensor/ctrlLp1_value sensor user - $scobj_hpath sensor/ctrlLp2_value sensor user - $scobj_hpath sensor/sensorValueA sensor user - $scobj_hpath sensor/sensorValueB sensor user - $scobj_hpath sensor/sensorValueC sensor user - $scobj_hpath sensor/sensorValueD sensor user - " - # $scobj_hpath sampleSensor _sensor_sampleSensor - set aliasProperties " - $scobj_hpath Tsample sensor _sensor_Tsample - $scobj_hpath ctrlLp1_value sensor _sensor_ctrlLp1_value - $scobj_hpath ctrlLp2_value sensor _sensor_ctrlLp2_value - $scobj_hpath sensorValueA sensor _sensor_sensorValueA - $scobj_hpath sensorValueB sensor _sensor_sensorValueB - $scobj_hpath sensorValueC sensor _sensor_sensorValueC - $scobj_hpath sensorValueD sensor _sensor_sensorValueD - " - } + foreach {rootpath hpath klasse priv} $nxProperties { hsetprop $rootpath/$hpath klass $klasse hsetprop $rootpath/$hpath privilege $priv