diff --git a/site_ansto/instrument/hrpd/echidna_configuration.tcl b/site_ansto/instrument/hrpd/echidna_configuration.tcl index 61f8ae28..f6d34092 100644 --- a/site_ansto/instrument/hrpd/echidna_configuration.tcl +++ b/site_ansto/instrument/hrpd/echidna_configuration.tcl @@ -1,10 +1,10 @@ -# $Revision: 1.25 $ -# $Date: 2007-08-20 22:54:45 $ +# $Revision: 1.26 $ +# $Date: 2007-11-05 02:28:46 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ # Required by server_config.tcl -VarMake Instrument Text Internal +VarMake Instrument Text Internal Instrument echidna Instrument lock @@ -35,9 +35,6 @@ fileeval $cfPath(scan)/scan.tcl source $cfPath(hipadaba)/hipadaba_configuration.tcl source gumxml.tcl -#::histogram_memory::setmode pulser -#::histogram_memory::setmode calibration -::histogram_memory::setmode normal ::histogram_memory::initialize diff --git a/site_ansto/instrument/rsd/kowari_configuration.tcl b/site_ansto/instrument/rsd/kowari_configuration.tcl index f1573547..f6b98cfe 100644 --- a/site_ansto/instrument/rsd/kowari_configuration.tcl +++ b/site_ansto/instrument/rsd/kowari_configuration.tcl @@ -1,11 +1,10 @@ -# $Revision: 1.8 $ -# $Date: 2007-08-20 22:54:45 $ +# $Revision: 1.9 $ +# $Date: 2007-11-05 02:29:31 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ # Required by server_config.tcl VarMake Instrument Text Internal -sicslist setatt Instrument privilege internal Instrument kowari Instrument lock @@ -33,9 +32,6 @@ fileeval $cfPath(scan)/scan.tcl source $cfPath(hipadaba)/hipadaba_configuration.tcl source gumxml.tcl -#::histogram_memory::setmode pulser -#::histogram_memory::setmode calibration -::histogram_memory::setmode normal ::histogram_memory::initialize @@ -58,23 +54,7 @@ detector_description This detects Kowaris detector_description lock 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 -} +MakeStateMon hmscan fileeval extraconfig.tcl server_set_sobj_attributes buildHDB instrument_dictionary