Merged new hdb and nexus code.

r2099 | ffr | 2007-07-22 15:23:41 +1000 (Sun, 22 Jul 2007) | 2 lines
This commit is contained in:
Ferdi Franceschini
2007-07-22 15:23:41 +10:00
committed by Douglas Clowes
parent 4e407d0a73
commit 8770acc191
37 changed files with 2404 additions and 645 deletions

View File

@@ -1,9 +1,9 @@
# SICS common configuration
# $Revision: 1.26 $
# $Date: 2007-07-09 05:25:57 $
# $Revision: 1.27 $
# $Date: 2007-07-22 05:23:40 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by $Author: dcl $
# Last revision by $Author: ffr $
#set sicsroot /usr/local/sics
set sicsroot ../
@@ -11,9 +11,9 @@ set cfParent config
array set cfPath [list\
motors $cfParent/motors\
counter $cfParent/counter\
chopper $cfParent/chopper\
hmm $cfParent/hmm\
scan $cfParent/scan\
chopper $cfParent/chopper\
velsel $cfParent/velsel\
nexus $cfParent/nexus\
hipadaba $cfParent/hipadaba\
@@ -43,54 +43,53 @@ SicsUser spy 007 3
MakeDataNumber SicsDataNumber $sicsroot/data/DataNumber
#Instrument specific configs must set the Instrument variable
VarMake SicsDataPrefix Text Internal
::utility::mkVar SicsDataPrefix Text internal
SicsDataPrefix [SplitReply [Instrument]]
SicsDataPrefix lock
VarMake sics_release Text Internal
::utility::mkVar SicsDataSuffix Text manager
SicsDataSuffix nx.hdf
::utility::mkVar sics_release Text internal
set tmpstr [string map {"$" ""} {$Name: not supported by cvs2svn $}]
sics_release [lindex $tmpstr [expr [llength $tmpstr] - 1]]
sics_release lock
VarMake sics_revision_num Text Internal
set tmpstr [string map {"$" ""} {$Revision: 1.26 $}]
::utility::mkVar sics_revision_num Text internal
set tmpstr [string map {"$" ""} {$Revision: 1.27 $}]
sics_revision_num [lindex $tmpstr [expr [llength $tmpstr] - 1]]
sics_revision_num lock
VarMake SicsDataPath Text Internal
::utility::mkVar SicsDataPath Text internal
SicsDataPath $sicsroot/data/
SicsDataPath lock
VarMake SicsDataPostFix Text User
#SicsDataPostFix .hdf
#SicsDataPostFix lock
VarMake Title Text User
VarMake Sample Text User
VarMake User Text User
VarMake Email Text User
VarMake Phone Text User
VarMake starttime Text User
VarMake currentfile Text User
VarMake batchroot Text User
::utility::mkVar Title Text user title true experiment true true
::utility::mkVar Sample Text user description true sample true true
::utility::mkVar User Text user user 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 starttime Text user start true experiment true true
MakeDrive
exe batchpath ../batch
exe syspath ../batch
VarMake detector_type Text Internal
VarMake detector_description Text Internal
::utility::mkVar detector_type Text internal
::utility::mkVar detector_description Text internal
VarMake dataFileName Text User
::utility::mkVar dataFileName Text user datafile true experiment true true
VarMake hmm_simulation Text Internal
::utility::mkVar hmm_simulation Text internal
hmm_simulation false
VarMake counter_simulation Text Internal
::utility::mkVar counter_simulation Text internal
counter_simulation false
VarMake motor_simulation Text Internal
::utility::mkVar motor_simulation Text internal
motor_simulation false
VarMake sics_simulation Text Internal
::utility::mkVar sics_simulation Text internal
sics_simulation false
if {[SplitReply [sics_simulation]] == "true"} {
@@ -98,3 +97,27 @@ if {[SplitReply [sics_simulation]] == "true"} {
counter_simulation true
motor_simulation true
}
proc server_set_sobj_attributes {} {
# set_sicsobj_atts sobj klass group name control data
#set_sicsobj_atts Title experiment @none title true true;
#set_sicsobj_atts Sample experiment user sample true true;
#set_sicsobj_atts User experiment user name true true;
#set_sicsobj_atts Email experiment user email true true;
#set_sicsobj_atts Phone experiment user phone true true;
#set_sicsobj_atts starttime experiment user start true true;
#set_sicsobj_atts dataFileName experiment @none datafile true true;
#sicslist setatt SicsDataPrefix 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