From c3f5087ea48d49da3f2c737491e302b87bafba4b Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Mon, 3 Feb 2014 23:14:20 +1100
Subject: [PATCH] Added PLC_HOSTPORT dictionary. TODO set IP PORT

---
 .../instrument/bilby/hostport_config.tcl      | 22 ++++++++++---------
 .../instrument/bilby/hostport_config_test.tcl | 20 ++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/site_ansto/instrument/bilby/hostport_config.tcl b/site_ansto/instrument/bilby/hostport_config.tcl
index b8a54d9e..b62c704f 100644
--- a/site_ansto/instrument/bilby/hostport_config.tcl
+++ b/site_ansto/instrument/bilby/hostport_config.tcl
@@ -20,6 +20,7 @@ foreach {bm host port} {
 }
 
 # HISTOGRAM SERVER HOST AND PORT
+# TODO HV control 
 foreach {key host port} {
   HMM das1-bilby.nbi.ansto.gov.au 8080
   HMSTAT das1-bilby.nbi.ansto.gov.au 8081
@@ -30,19 +31,20 @@ foreach {key host port} {
   dict set HISTMEM_HOSTPORT $key PORT $port
 }
 
-# SPIN FLIPPER HOST AND PORT
-foreach {key host port} {
-  ANSFR83B 137.157.202.71 4002
-} {
-  dict set ACGEN_HOSTPORT $key HOST $host
-  dict set ACGEN_HOSTPORT $key PORT $port
-}
-
 # VELOCITY SELECTOR HOST AND PORT
+# TODO
 foreach {key host port} {
-  NVS40 137.157.202.73 10000
-  NVS43 137.157.202.74 10000
+  NVS IP 10000
 } {
   dict set VELSEL_HOSTPORT $key HOST $host
   dict set VELSEL_HOSTPORT $key PORT $port
 }
+
+# Safety Interlock System
+# TODO
+foreach {host port} {
+  IP PORT
+} {
+  dict set PLC_HOSTPORT HOST $host
+  dict set PLC_HOSTPORT PORT $port
+}
diff --git a/site_ansto/instrument/bilby/hostport_config_test.tcl b/site_ansto/instrument/bilby/hostport_config_test.tcl
index fc6cae22..28b076de 100644
--- a/site_ansto/instrument/bilby/hostport_config_test.tcl
+++ b/site_ansto/instrument/bilby/hostport_config_test.tcl
@@ -32,19 +32,19 @@ foreach {key host port} {
   dict set HISTMEM_HOSTPORT $key PORT $port
 }
 
-# SPIN FLIPPER HOST AND PORT
-foreach {key host port} {
-  ANSFR83B localhost 64001
-} {
-  dict set ACGEN_HOSTPORT $key HOST $host
-  dict set ACGEN_HOSTPORT $key PORT $port
-}
-
 # VELOCITY SELECTOR HOST AND PORT
 foreach {key host port} {
-  NVS40 localhost 10000
-  NVS43 localhost 10000
+  NVS localhost 10000
 } {
   dict set VELSEL_HOSTPORT $key HOST $host
   dict set VELSEL_HOSTPORT $key PORT $port
 }
+
+# Safety Interlock System
+# TODO
+foreach {host port} {
+  NONE NONE
+} {
+  dict set PLC_HOSTPORT HOST $host
+  dict set PLC_HOSTPORT PORT $port
+}