From 350055ea573f27eddab26c1aba90108e11059182 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Wed, 26 Sep 2012 09:46:38 +1000 Subject: [PATCH] common_instrument_dictionary.tcl and instdict_specification.tcl Provide fermi_chopper group for the chopper speed and phase motor objects. r3746 | ffr | 2012-09-26 09:46:38 +1000 (Wed, 26 Sep 2012) | 4 lines --- .../config/hipadaba/common_instrument_dictionary.tcl | 6 ++++++ .../instrument/config/hipadaba/instdict_specification.tcl | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl b/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl index 243baf9e..c2d4e2bb 100644 --- a/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl +++ b/site_ansto/instrument/config/hipadaba/common_instrument_dictionary.tcl @@ -32,6 +32,12 @@ set instrument_dictionary [subst { datatype @none property {data true control true nxsave false klass NXinstrument type instrument} } + instrument/fermi_chopper { + privilege spy + sobj {@any fermi_chopper} + datatype @none + property {data true control true nxsave true klass NXfermi_chopper type part} + } instrument/parameters { privilege spy sobj {@any parameter} diff --git a/site_ansto/instrument/config/hipadaba/instdict_specification.tcl b/site_ansto/instrument/config/hipadaba/instdict_specification.tcl index acac4dfd..0952d7e3 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 {@none aperture attenuator collimator command crystal data detector disk_chopper entry environment experiment graphics instrument slits monitor monochromator parameter plc reduce sample scan sensor source user} +set sobj_klass_list {@none aperture attenuator collimator command crystal data detector disk_chopper entry environment experiment fermi_chopper graphics instrument slits monitor monochromator parameter plc reduce sample scan sensor source user} set sobj_sicstype_list {chopperadapter environment_controller sicsvariable macro motor configurablevirtualmotor tasmot singlecounter histmem nxscript sicsdata scanobject sct_object} # 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.