Remove dependency on named ports for SICSserver ports.

site_ansto/instrument/server_config.tcl

@@ -53,7 +53,6 @@ if [info exists env(SOCKOFFSET)] {
 }
 if {[info exists env(SICS_SIMULATION)] != 1} {
   set sicsroot ../
-  source sics_ports.tcl
   sics_simulation false
   dict for {simflag d} $SIMFLAG_VAL {
     $simflag [dict get $d ICSVAL]
@@ -147,11 +146,11 @@ installprotocolhandler
 ServerOption statusfile $sicsroot/log/status.tcl 
 ServerOption RedirectFile $sicsroot/log/stdout 
 ServerOption LogFileDir $sicsroot/log 
-ServerOption QuieckPort [get_portnum $quieckport ]
-ServerOption ServerPort [get_portnum $serverport ]
-ServerOption InterruptPort [get_portnum $interruptport ]
+ServerOption QuieckPort $quieckport
+ServerOption ServerPort $serverport
+ServerOption InterruptPort  $interruptport
 ServerOption TelWord sicslogin 
-ServerOption TelnetPort [get_portnum $telnetport ]
+ServerOption TelnetPort  $telnetport
 ServerOption ReadUserPasswdTimeout 600000 
 ServerOption AcceptTimeOut 10 
 ServerOption ReadTimeOut 10 
@@ -248,7 +247,7 @@ proc server_set_sobj_attributes {} {
     ::utility::set_sct_object_attributes
 ## TODO move the following to the new ansto gumxml.tcl
     sicslist setatt getgumtreexml privilege internal
-    clientput "serverport [get_portnum $::serverport]"
+    clientput "serverport $::serverport"
   } message ] {
     if {$::errorCode=="NONE"} {return $message}
     return -code error $message