linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow named ports or port numbers for the SICS ports

Browse Source 
Use nexus data names.
Set SICS object attributes for new hdb and nexus support.

r2110 | ffr | 2007-08-16 14:25:37 +1000 (Thu, 16 Aug 2007) | 4 lines
This commit is contained in:
Ferdi Franceschini
2007-08-16 14:25:37 +10:00
committed by Douglas Clowes
parent 3fb134872b
commit f873ffce89
1 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
site_ansto/instrument/server_config.tcl
View File

@@ -1,7 +1,7 @@
# SICS common configuration # SICS common configuration
# $Revision: 1.27 $ # $Revision: 1.28 $
# $Date: 2007-07-22 05:23:40 $ # $Date: 2007-08-16 04:25:37 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by $Author: ffr $ # Last revision by $Author: ffr $
@@ -28,11 +28,11 @@ source util/utility.tcl
ServerOption statusfile $sicsroot/log/status.tcl ServerOption statusfile $sicsroot/log/status.tcl
ServerOption RedirectFile $sicsroot/log/stdout ServerOption RedirectFile $sicsroot/log/stdout
ServerOption LogFileDir $sicsroot/log ServerOption LogFileDir $sicsroot/log
ServerOption QuieckPort [portnum $quieckport ] ServerOption QuieckPort [get_portnum $quieckport ]
ServerOption ServerPort [portnum $serverport ] ServerOption ServerPort [get_portnum $serverport ]
ServerOption InterruptPort [portnum $interruptport ] ServerOption InterruptPort [get_portnum $interruptport ]
ServerOption TelWord sicslogin ServerOption TelWord sicslogin
ServerOption TelnetPort [portnum $telnetport ] ServerOption TelnetPort [get_portnum $telnetport ]
ServerOption ReadUserPasswdTimeout 600000 ServerOption ReadUserPasswdTimeout 600000
ServerOption AcceptTimeOut 10 ServerOption AcceptTimeOut 10
ServerOption ReadTimeOut 10 ServerOption ReadTimeOut 10
@@ -45,10 +45,9 @@ MakeDataNumber SicsDataNumber $sicsroot/data/DataNumber
#Instrument specific configs must set the Instrument variable #Instrument specific configs must set the Instrument variable
::utility::mkVar SicsDataPrefix Text internal ::utility::mkVar SicsDataPrefix Text internal
SicsDataPrefix [SplitReply [Instrument]] SicsDataPrefix [SplitReply [Instrument]]
SicsDataPrefix lock
::utility::mkVar SicsDataSuffix Text manager ::utility::mkVar SicsDataPostFix Text manager
SicsDataSuffix nx.hdf SicsDataPostFix nx.hdf
::utility::mkVar sics_release Text internal ::utility::mkVar sics_release Text internal
@@ -57,7 +56,7 @@ sics_release [lindex $tmpstr [expr [llength $tmpstr] - 1]]
sics_release lock sics_release lock
::utility::mkVar sics_revision_num Text internal ::utility::mkVar sics_revision_num Text internal
set tmpstr [string map {"$" ""} {$Revision: 1.27 $}] set tmpstr [string map {"$" ""} {$Revision: 1.28 $}]
sics_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]] sics_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
sics_revision_num lock sics_revision_num lock
@@ -66,7 +65,7 @@ SicsDataPath $sicsroot/data/
SicsDataPath lock SicsDataPath lock
::utility::mkVar Title Text user title true experiment true true ::utility::mkVar Title Text user title true experiment true true
::utility::mkVar Sample Text user description true sample true true ::utility::mkVar Sample Text user description true sample true true
::utility::mkVar User Text user user true user true true ::utility::mkVar User Text user name true user true true
::utility::mkVar Email Text user email true user true true ::utility::mkVar Email Text user email true user true true
::utility::mkVar Phone Text user phone true user true true ::utility::mkVar Phone Text user phone true user true true
::utility::mkVar starttime Text user start true experiment true true ::utility::mkVar starttime Text user start true experiment true true
@@ -78,7 +77,7 @@ exe syspath ../batch
::utility::mkVar detector_type Text internal ::utility::mkVar detector_type Text internal
::utility::mkVar detector_description Text internal ::utility::mkVar detector_description Text internal
::utility::mkVar dataFileName Text user datafile true experiment true true ::utility::mkVar dataFileName Text user file_name true experiment true true
::utility::mkVar hmm_simulation Text internal ::utility::mkVar hmm_simulation Text internal
hmm_simulation false hmm_simulation false
@@ -99,25 +98,14 @@ if {[SplitReply [sics_simulation]] == "true"} {
} }
proc server_set_sobj_attributes {} { proc server_set_sobj_attributes {} {
# set_sicsobj_atts sobj klass group name control data motor_set_sobj_attributes
#set_sicsobj_atts Title experiment @none title true true; ::utility::set_motor_attributes
#set_sicsobj_atts Sample experiment user sample true true; ::utility::set_histomem_attributes
#set_sicsobj_atts User experiment user name true true; ::utility::set_sobj_attributes
#set_sicsobj_atts Email experiment user email true true; ::plc::set_sobj_attributes
#set_sicsobj_atts Phone experiment user phone true true; ::counter::set_sobj_attributes
#set_sicsobj_atts starttime experiment user start true true; ::nexus::set_sobj_attributes
#set_sicsobj_atts dataFileName experiment @none datafile true true; ::histogram_memory::set_sobj_attributes
## TODO move the following to the new ansto gumxml.tcl
#sicslist setatt SicsDataPrefix privilege internal sicslist setatt getgumtreexml privilege internal
#sicslist setatt sics_release privilege internal
#sicslist setatt sics_revision_num privilege internal
#sicslist setatt SicsDataPath privilege internal
#sicslist setatt detector_type privilege internal
#sicslist setatt detector_description privilege internal
#sicslist setatt hmm_simulation privilege internal
#sicslist setatt counter_simulation privilege internal
#sicslist setatt motor_simulation privilege internal
#sicslist setatt sics_simulation privilege internal
} }
server_set_sobj_attributes