From 000de2ec2be9fd1d49e18a2103b2dc100dfbbfe8 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 16 Aug 2007 14:34:46 +1000 Subject: [PATCH] Remove children list from spec. Added instrument klass. r2115 | ffr | 2007-08-16 14:34:46 +1000 (Thu, 16 Aug 2007) | 3 lines --- .../instrument/config/hipadaba/instdict_specification.tcl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/site_ansto/instrument/config/hipadaba/instdict_specification.tcl b/site_ansto/instrument/config/hipadaba/instdict_specification.tcl index 8c4c8ece..93454b6a 100644 --- a/site_ansto/instrument/config/hipadaba/instdict_specification.tcl +++ b/site_ansto/instrument/config/hipadaba/instdict_specification.tcl @@ -11,7 +11,7 @@ set boolean {true false} #} # SICS OBJECTS MUST PROVIDE THE FOLLOWING INFORMATION -set sobj_klass_list {aperture attenuator collimator command crystal data detector experiment graphics monitor monochromator plc sample scan user} +set sobj_klass_list {@none aperture attenuator collimator command crystal data detector experiment graphics instrument monitor monochromator plc sample scan user} set sobj_sicstype_list {sicsvariable macro motor configurablevirtualmotor singlecounter histmem nxscript sicsdata scanobject} # Different kinds of things are added to the hdb in different ways. # command: This is something a client can run with hset /a/b/c start, it may have parameters and feedback. @@ -114,10 +114,9 @@ if 1 { # hpath looks like /a/b/c/ set regex_hpath {^(/)$|^([_a-z0-9]+)(/[_a-z0-9]+)*$} -set instrument_dictionary [subst { +set instrument_dictionary_spec [subst { regex_hpath { optional { - children {alpha alpha} sobj {{@any $sobj_sicstype_list} {$sobj_klass_list}} } required {