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

More common initialisation code has been moved from the instrument configuration files to server_config.tcl:server_init

Browse Source 
server_init now handles restoring status before calling initialisation commands as well as loading extraconfig, building the HDB and catching errors.
Added dummy_motors in the motor_configuration.tcl files for automated tests.

sicshipadaba.c
Fix broken "hset /path start" by set connection object in command callback.

r2724 | ffr | 2008-10-20 11:08:31 +1100 (Mon, 20 Oct 2008) | 7 lines
This commit is contained in:
Ferdi Franceschini
2008-10-20 11:08:31 +11:00
committed by Douglas Clowes
parent fb97ee8631
commit 7ded983eba
11 changed files with 90 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
View File

@@ -1,8 +1,7 @@
# $Revision: 1.31 $
# $Date: 2008-09-23 22:44:01 $
# $Revision: 1.32 $
# $Date: 2008-10-20 00:08:30 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
source $cfPath(anticollider)/anticollider.tcl
# START MOTOR CONFIGURATION
@@ -726,4 +725,3 @@ make_gap_motors ss2hg gap ss2ho offset ss2r ss2l mm $slit2HGroup
proc motor_set_sobj_attributes {} {
}
# END MOTOR CONFIGURATION
::anticollider::init

27
site_ansto/instrument/hrpd/echidna_configuration.tcl
View File

@@ -1,5 +1,5 @@
# $Revision: 1.33 $
# $Date: 2008-08-19 05:11:55 $
# $Revision: 1.34 $
# $Date: 2008-10-20 00:08:30 $
# Author: Ferdi Franceschini (ffr@ansto.gov.au)
# Last revision by: $Author: ffr $
@@ -31,25 +31,14 @@ fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(scan)/scan.tcl
fileeval $cfPath(commands)/commands.tcl
fileeval $cfPath(anticollider)/anticollider.tcl
source gumxml.tcl
########
# Parameters set above the restore command will be clobbered by
# the values in the status.tcl file
# BIG WARNING: DON'T PUT 'restore' IN A CATCH BLOCK BECAUSE IT RETURNS
# AN ERROR IF THERE IS NO ../log/status.tcl FILE.
restore
catch {
# ::environment::temperature::add_ls340 tc1 1
# ::environment::temperature::add_ls340 tc2 2
server_init
# ::environment::temperature::add_west400
server_init
###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.
if [file exists ../extraconfig.tcl] {
fileeval ../extraconfig.tcl
}
buildHDB instrument_dictionary
}
clientput $errorContext
clientput $callStack
# You can add extra-configuration code in ../extraconfig.tcl