From 4068f9918029c22a6ccfe61d139388568b3dd28e Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Fri, 15 Jan 2010 18:53:30 +1100 Subject: [PATCH] Fixed some deployment problems r2871 | ffr | 2010-01-15 18:53:30 +1100 (Fri, 15 Jan 2010) | 2 lines --- .../instrument/hipd/config/INSTCFCOMMON.TXT | 1 + .../environment/temperature/west400.tcl | 50 ------------------- .../instrument/hipd/wombat_configuration.tcl | 2 +- .../instrument/hrpd/config/INSTCFCOMMON.TXT | 1 + 4 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 site_ansto/instrument/hipd/config/environment/temperature/west400.tcl diff --git a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT index add63e17..b0058962 100644 --- a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT @@ -4,6 +4,7 @@ config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl config/environment/temperature/lakeshore340_common.tcl config/environment/temperature/sct_lakeshore_3xx.tcl +config/environment/temperature/west400.tcl config/hipadaba/hipadaba_configuration_common.tcl config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/instdict_specification.tcl diff --git a/site_ansto/instrument/hipd/config/environment/temperature/west400.tcl b/site_ansto/instrument/hipd/config/environment/temperature/west400.tcl deleted file mode 100644 index 3fa90140..00000000 --- a/site_ansto/instrument/hipd/config/environment/temperature/west400.tcl +++ /dev/null @@ -1,50 +0,0 @@ -# Author: Ferdi Franceschini (ffr@ansto.gov.au) - -namespace eval ::environment::temperature { } - -# @brief Make a simulated temperature controller object. -# -# @param temp_sobj, name for temperature controller object. -proc ::environment::temperature::mkwest400sim {temp_sobj} { - EvFactory new $temp_sobj sim - sicslist setatt $temp_sobj numsensors 1 - sicslist setatt $temp_sobj controlsensor sensora - sicslist setatt $temp_sobj sensorlist sensora - sicslist setatt $temp_sobj units kelvin - sicslist setatt $temp_sobj klass @none -} - -#WEST4100 tempcontroller creation -proc ::environment::temperature::mkwest400 {temp_sobj} { -MakeRS232Controller sertemp 137.157.201.88 502 -sertemp timeout 300 -sertemp sendterminator 0x0 -sertemp replyterminator 0x0 -EvFactory new tc1 west4100 sertemp 1 2 - -sicslist setatt tc1 units kelvin -sicslist setatt tc1 klass @none -} - -# @brief Adds a west400 temperature controller object. -# -# This must be called when the instrument configuration is loaded and before\n -# the buildHDB function is called. Currently there is no way to add and remove\n -# environment controllers and their hdb paths at runtime. -proc ::environment::temperature::add_west400 {} { - set sim_mode [SplitReply [environment_simulation]] - if {$sim_mode == "true"} { - ::environment::temperature::mkwest400sim tc1 - } else { - ::environment::temperature::mkwest400 tc1 - tc1 Upperlimit 1500 - tc1 Lowerlimit 0 - tc1 tolerance 10 - } - - sicslist setatt tc1 environment_name tempone - sicslist setatt tc1 long_name control_sensor_reading -::environment::mkenvinfo tc1 {ramprate {priv user} powerlimit {priv manager} } -#::environment::mkenvinfo tc1 {heateron {priv user} range {priv manager} } - -} diff --git a/site_ansto/instrument/hipd/wombat_configuration.tcl b/site_ansto/instrument/hipd/wombat_configuration.tcl index 2f320e10..dd7986cb 100644 --- a/site_ansto/instrument/hipd/wombat_configuration.tcl +++ b/site_ansto/instrument/hipd/wombat_configuration.tcl @@ -37,7 +37,7 @@ source gumxml.tcl # Drivers for Lakeshore Temperature Controller # old Lakeshore driver (c-code) - ::environment::temperature::add_ls340 tc1 1 +# ::environment::temperature::add_ls340 tc1 1 # ::environment::temperature::add_ls340 tc2 2 # New Lakeshore series driver for models 340 and 336 - (tcl-code, version 20090824) - beta status diff --git a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT index add63e17..b0058962 100644 --- a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT @@ -4,6 +4,7 @@ config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl config/environment/temperature/lakeshore340_common.tcl config/environment/temperature/sct_lakeshore_3xx.tcl +config/environment/temperature/west400.tcl config/hipadaba/hipadaba_configuration_common.tcl config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/instdict_specification.tcl