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

Added optics subsystem path.

Browse Source 
Also added chopper_simulation flag for platypus.

r2191 | ffr | 2007-10-23 12:42:52 +1000 (Tue, 23 Oct 2007) | 3 lines
This commit is contained in:
Ferdi Franceschini
2007-10-23 12:42:52 +10:00
committed by Douglas Clowes
parent 2018e71b8f
commit 7b0162177e
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
site_ansto/instrument/sans/quokka_configuration.tcl
View File

@@ -1,11 +1,10 @@
# $Revision: 1.5 $ # $Revision: 1.6 $
# $Date: 2007-10-03 22:33:28 $ # $Date: 2007-10-23 02:42:52 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $ # Last revision by: $Author: ffr $
# Required by server_config.tcl # Required by server_config.tcl
VarMake Instrument Text Internal VarMake Instrument Text Internal
sicslist setatt Instrument privilege internal
Instrument quokka Instrument quokka
Instrument lock Instrument lock
@@ -27,6 +26,7 @@ fileeval $cfPath(motors)/motor_configuration.tcl
restore restore
fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(optics)/optics.tcl
fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(counter)/counter.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(nexus)/nxscripts.tcl
@@ -36,24 +36,7 @@ source gumxml.tcl
::histogram_memory::initialize ::histogram_memory::initialize
MakeStateMon hmscan MakeStateMon hmscan
if 0 {
proc instrument_set_sobj_attributes {} {
motor_set_sobj_attributes
::utility::set_motor_attributes
::utility::set_histomem_attributes
::utility::set_sobj_attributes
::plc::set_sobj_attributes
::counter::set_sobj_attributes
::nexus::set_sobj_attributes
::histogram_memory::set_sobj_attributes
## TODO move the following to the new ansto gumxml.tcl
sicslist setatt getgumtreexml privilege internal
}
instrument_set_sobj_attributes
}
fileeval extraconfig.tcl fileeval extraconfig.tcl
server_set_sobj_attributes server_set_sobj_attributes
buildHDB instrument_dictionary buildHDB instrument_dictionary

17
site_ansto/instrument/server_config.tcl
View File

@@ -1,7 +1,7 @@
# SICS common configuration # SICS common configuration
# $Revision: 1.29 $ # $Revision: 1.30 $
# $Date: 2007-08-20 22:52:25 $ # $Date: 2007-10-23 02:42:52 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au) # Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by $Author: ffr $ # Last revision by $Author: ffr $
@@ -10,6 +10,7 @@ set sicsroot ../
set cfParent config set cfParent config
array set cfPath [list\ array set cfPath [list\
motors $cfParent/motors\ motors $cfParent/motors\
optics $cfParent/optics\
counter $cfParent/counter\ counter $cfParent/counter\
chopper $cfParent/chopper\ chopper $cfParent/chopper\
hmm $cfParent/hmm\ hmm $cfParent/hmm\
@@ -56,7 +57,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.29 $}] set tmpstr [string map {"$" ""} {$Revision: 1.30 $}]
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
@@ -88,13 +89,17 @@ counter_simulation false
::utility::mkVar motor_simulation Text internal ::utility::mkVar motor_simulation Text internal
motor_simulation false motor_simulation false
::utility::mkVar sics_simulation Text internal ::utility::mkVar chopper_simulation Text internal
sics_simulation false chopper_simulation false
if {[SplitReply [sics_simulation]] == "true"} { ::utility::mkVar sics_fullsimulation Text internal
sics_fullsimulation false
if {[SplitReply [sics_fullsimulation]] == "true"} {
hmm_simulation true hmm_simulation true
counter_simulation true counter_simulation true
motor_simulation true motor_simulation true
chopper_simulation true
} }
proc server_set_sobj_attributes {} { proc server_set_sobj_attributes {} {