From bea943ddf2a7a69ff1d6418d261481d2990d3fd8 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Tue, 25 Mar 2014 09:23:57 +1100 Subject: [PATCH] Add new reactor status object to instruments. --- .../instrument/bilby/config/INSTCFCOMMON.TXT | 3 ++- .../instrument/bilby/config/source/source.tcl | 6 ------ site_ansto/instrument/config/source/source.tcl | 16 ++++++++++++++++ .../instrument/dingo/config/INSTCFCOMMON.TXT | 3 ++- .../instrument/dingo/config/source/source.tcl | 8 -------- .../instrument/hipd/config/INSTCFCOMMON.TXT | 3 ++- .../instrument/hipd/config/source/source.tcl | 5 ----- .../instrument/hrpd/config/INSTCFCOMMON.TXT | 3 ++- .../instrument/hrpd/config/source/source.tcl | 5 ----- .../kookaburra/config/INSTCFCOMMON.TXT | 3 ++- .../kookaburra/config/source/source.tcl | 8 -------- .../instrument/lyrebird/config/INSTCFCOMMON.TXT | 3 ++- .../instrument/lyrebird/config/source/source.tcl | 6 ------ .../instrument/pas/config/source/source.tcl | 7 ------- .../instrument/pelican/config/INSTCFCOMMON.TXT | 3 ++- .../instrument/pelican/config/source/source.tcl | 8 -------- .../reflectometer/config/INSTCFCOMMON.TXT | 3 ++- .../reflectometer/config/source/source.tcl | 7 ------- .../instrument/rsd/config/INSTCFCOMMON.TXT | 3 ++- .../instrument/rsd/config/source/source.tcl | 6 ------ .../instrument/sans/config/INSTCFCOMMON.TXT | 3 ++- .../instrument/sans/config/source/source.tcl | 6 ------ .../instrument/tas/config/INSTCFCOMMON.TXT | 3 ++- .../instrument/tas/config/source/source.tcl | 8 -------- 24 files changed, 38 insertions(+), 91 deletions(-) delete mode 100644 site_ansto/instrument/bilby/config/source/source.tcl create mode 100644 site_ansto/instrument/config/source/source.tcl delete mode 100644 site_ansto/instrument/dingo/config/source/source.tcl delete mode 100644 site_ansto/instrument/hipd/config/source/source.tcl delete mode 100644 site_ansto/instrument/hrpd/config/source/source.tcl delete mode 100644 site_ansto/instrument/kookaburra/config/source/source.tcl delete mode 100644 site_ansto/instrument/lyrebird/config/source/source.tcl delete mode 100644 site_ansto/instrument/pas/config/source/source.tcl delete mode 100644 site_ansto/instrument/pelican/config/source/source.tcl delete mode 100644 site_ansto/instrument/reflectometer/config/source/source.tcl delete mode 100644 site_ansto/instrument/rsd/config/source/source.tcl delete mode 100644 site_ansto/instrument/sans/config/source/source.tcl delete mode 100644 site_ansto/instrument/tas/config/source/source.tcl diff --git a/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT b/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT index e8a87ed3..0f1607f8 100644 --- a/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/bilby/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/bilby/config/source/source.tcl b/site_ansto/instrument/bilby/config/source/source.tcl deleted file mode 100644 index 730c4f55..00000000 --- a/site_ansto/instrument/bilby/config/source/source.tcl +++ /dev/null @@ -1,6 +0,0 @@ -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "cold" -} - diff --git a/site_ansto/instrument/config/source/source.tcl b/site_ansto/instrument/config/source/source.tcl new file mode 100644 index 00000000..cab62522 --- /dev/null +++ b/site_ansto/instrument/config/source/source.tcl @@ -0,0 +1,16 @@ +fileeval $cfPath(source)/sct_reactor_status.tcl + +if {[SplitReply [opal_simulation]]=="false"} { + MakeAsyncProtocol std + std sendterminator \r\n\r\n + std replyterminator 0x03 + MakeAsyncQueue aqreactor std neutron.ansto.gov.au 80 + aqreactor timeout 2000 +} +add_reactor_status source aqadapter aqreactor + +namespace eval ::source { + proc isc_initialize {} { + } +} + diff --git a/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT b/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT index e9ca426e..f0ad4f76 100644 --- a/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/dingo/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/dingo/config/source/source.tcl b/site_ansto/instrument/dingo/config/source/source.tcl deleted file mode 100644 index 50967ab8..00000000 --- a/site_ansto/instrument/dingo/config/source/source.tcl +++ /dev/null @@ -1,8 +0,0 @@ -# Author Jing Chen (jgn@ansto.gov.au) - -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "thermal" -} - diff --git a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT index a009ef39..f6e21877 100644 --- a/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hipd/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/hipd/config/source/source.tcl b/site_ansto/instrument/hipd/config/source/source.tcl deleted file mode 100644 index e9107319..00000000 --- a/site_ansto/instrument/hipd/config/source/source.tcl +++ /dev/null @@ -1,5 +0,0 @@ -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "thermal" -} diff --git a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT index 7592c1df..e84f2219 100644 --- a/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/hrpd/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/hrpd/config/source/source.tcl b/site_ansto/instrument/hrpd/config/source/source.tcl deleted file mode 100644 index e9107319..00000000 --- a/site_ansto/instrument/hrpd/config/source/source.tcl +++ /dev/null @@ -1,5 +0,0 @@ -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "thermal" -} diff --git a/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT b/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT index 8bcc5a06..04f2a106 100644 --- a/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/kookaburra/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/kookaburra/config/source/source.tcl b/site_ansto/instrument/kookaburra/config/source/source.tcl deleted file mode 100644 index 50967ab8..00000000 --- a/site_ansto/instrument/kookaburra/config/source/source.tcl +++ /dev/null @@ -1,8 +0,0 @@ -# Author Jing Chen (jgn@ansto.gov.au) - -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "thermal" -} - diff --git a/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT b/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT index eeee47e2..93b623e1 100644 --- a/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/lyrebird/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/lyrebird/config/source/source.tcl b/site_ansto/instrument/lyrebird/config/source/source.tcl deleted file mode 100644 index 93a8dbc1..00000000 --- a/site_ansto/instrument/lyrebird/config/source/source.tcl +++ /dev/null @@ -1,6 +0,0 @@ -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "thermal" -} - diff --git a/site_ansto/instrument/pas/config/source/source.tcl b/site_ansto/instrument/pas/config/source/source.tcl deleted file mode 100644 index b4fa145f..00000000 --- a/site_ansto/instrument/pas/config/source/source.tcl +++ /dev/null @@ -1,7 +0,0 @@ -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "cold" -} - - diff --git a/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT b/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT index bbbf2f74..9231db47 100644 --- a/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/pelican/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/pelican/config/source/source.tcl b/site_ansto/instrument/pelican/config/source/source.tcl deleted file mode 100644 index 50967ab8..00000000 --- a/site_ansto/instrument/pelican/config/source/source.tcl +++ /dev/null @@ -1,8 +0,0 @@ -# Author Jing Chen (jgn@ansto.gov.au) - -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "thermal" -} - diff --git a/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT b/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT index c5a4a06b..6e8f55be 100644 --- a/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/reflectometer/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/reflectometer/config/source/source.tcl b/site_ansto/instrument/reflectometer/config/source/source.tcl deleted file mode 100644 index b4fa145f..00000000 --- a/site_ansto/instrument/reflectometer/config/source/source.tcl +++ /dev/null @@ -1,7 +0,0 @@ -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "cold" -} - - diff --git a/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT b/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT index da35e073..d7561521 100644 --- a/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/rsd/config/source/source.tcl b/site_ansto/instrument/rsd/config/source/source.tcl deleted file mode 100644 index 93a8dbc1..00000000 --- a/site_ansto/instrument/rsd/config/source/source.tcl +++ /dev/null @@ -1,6 +0,0 @@ -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "thermal" -} - diff --git a/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT b/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT index e8a87ed3..0f1607f8 100644 --- a/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/sans/config/INSTCFCOMMON.TXT @@ -1,4 +1,5 @@ -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/sans/config/source/source.tcl b/site_ansto/instrument/sans/config/source/source.tcl deleted file mode 100644 index 730c4f55..00000000 --- a/site_ansto/instrument/sans/config/source/source.tcl +++ /dev/null @@ -1,6 +0,0 @@ -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "cold" -} - diff --git a/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT b/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT index bf950b99..e66adad3 100644 --- a/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT +++ b/site_ansto/instrument/tas/config/INSTCFCOMMON.TXT @@ -1,5 +1,6 @@ config/load_setup.tcl -config/source/source_common.tcl +config/source/sct_reactor_status.tcl +config/source/source.tcl config/anticollider/anticollider_common.tcl config/plc/plc_common_1.tcl config/counter/counter_common_1.tcl diff --git a/site_ansto/instrument/tas/config/source/source.tcl b/site_ansto/instrument/tas/config/source/source.tcl deleted file mode 100644 index 50967ab8..00000000 --- a/site_ansto/instrument/tas/config/source/source.tcl +++ /dev/null @@ -1,8 +0,0 @@ -# Author Jing Chen (jgn@ansto.gov.au) - -source $cfPath(source)/source_common.tcl - -proc ::source::isc_initialize {} { - ::source::ic_initialize "thermal" -} -