From b09d07915c7700646e3d9665c51c952e6ea6e101 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Thu, 16 Aug 2007 17:04:07 +1000 Subject: [PATCH] Restore status from status.tcl when initialising SICS Initialise hmm. r2130 | ffr | 2007-08-16 17:04:07 +1000 (Thu, 16 Aug 2007) | 3 lines --- .../reflectometer/platypus_configuration.tcl | 33 ++++++------------- .../instrument/rsd/kowari_configuration.tcl | 25 +++++++------- .../instrument/sans/quokka_configuration.tcl | 19 +++++++---- 3 files changed, 35 insertions(+), 42 deletions(-) diff --git a/site_ansto/instrument/reflectometer/platypus_configuration.tcl b/site_ansto/instrument/reflectometer/platypus_configuration.tcl index 3dc64bec..90b1d4d7 100644 --- a/site_ansto/instrument/reflectometer/platypus_configuration.tcl +++ b/site_ansto/instrument/reflectometer/platypus_configuration.tcl @@ -1,11 +1,10 @@ -# $Revision: 1.11 $ -# $Date: 2007-07-22 05:23:40 $ +# $Revision: 1.12 $ +# $Date: 2007-08-16 07:03:04 $ # 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 platypus Instrument lock @@ -17,10 +16,14 @@ source server_config.tcl ######################################## # INSTRUMENT SPECIFIC CONFIGURATION -#set hmm_mode normal fileeval $cfPath(motors)/motor_configuration.tcl +######## +# Parameters set above the restore command will be clobbered by +# the values in the status.tcl file +restore + fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl @@ -33,26 +36,10 @@ source gumxml.tcl #::histogram_memory::setmode pulser #::histogram_memory::setmode calibration ::histogram_memory::setmode normal -#::histogram_memory::hmm_initialize -::histogram_memory::hmm_setup transparent 0 3 oat_nyc_eff oat_nxc_eff oat_ntc_eff -hmm_start 0 +::histogram_memory::initialize -MakeStateMon hmscan -proc instrument_set_sobj_attributes {} { - - motor_set_sobj_attributes - ::utility::set_motor_attributes - ::utility::set_histomem_attributes - ::utility::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 +server_set_sobj_attributes buildHDB instrument_dictionary -#buildHDB [instname]_dictionary fileeval extraconfig.tcl diff --git a/site_ansto/instrument/rsd/kowari_configuration.tcl b/site_ansto/instrument/rsd/kowari_configuration.tcl index 33c7f3c2..79e71519 100644 --- a/site_ansto/instrument/rsd/kowari_configuration.tcl +++ b/site_ansto/instrument/rsd/kowari_configuration.tcl @@ -1,10 +1,10 @@ -# $Revision: 1.6 $ -# $Date: 2007-07-22 05:58:51 $ +# $Revision: 1.7 $ +# $Date: 2007-08-16 07:04:07 $ # 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 sicslist setatt Instrument privilege internal Instrument kowari Instrument lock @@ -17,10 +17,14 @@ source server_config.tcl ######################################## # INSTRUMENT SPECIFIC CONFIGURATION -#set hmm_mode normal fileeval $cfPath(motors)/motor_configuration.tcl +######## +# Parameters set above the restore command will be clobbered by +# the values in the status.tcl file +restore + fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl @@ -32,14 +36,8 @@ source gumxml.tcl #::histogram_memory::setmode pulser #::histogram_memory::setmode calibration ::histogram_memory::setmode normal -#::histogram_memory::hmm_initialize -::histogram_memory::hmm_setup transparent 0 3 oat_nyc_eff oat_nxc_eff oat_ntc_eff -hmm_start 0 +::histogram_memory::initialize -VarMake detector_active_height_mm Float User -detector_active_height_mm 200.0 -VarMake detector_active_width Float User -detector_active_width 200.0 VarMake crystal_type Text User VarMake crystal_wavelength_A Float User @@ -60,12 +58,14 @@ 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 @@ -74,6 +74,7 @@ proc instrument_set_sobj_attributes {} { } instrument_set_sobj_attributes +} +server_set_sobj_attributes buildHDB instrument_dictionary -#buildHDB [instname]_dictionary fileeval extraconfig.tcl diff --git a/site_ansto/instrument/sans/quokka_configuration.tcl b/site_ansto/instrument/sans/quokka_configuration.tcl index 5508facb..46ca6f35 100644 --- a/site_ansto/instrument/sans/quokka_configuration.tcl +++ b/site_ansto/instrument/sans/quokka_configuration.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.2 $ -# $Date: 2007-07-22 05:23:40 $ +# $Revision: 1.3 $ +# $Date: 2007-08-16 07:04:07 $ # Author: Ferdi Franceschini (ffr@ansto.gov.au) # Last revision by: $Author: ffr $ @@ -21,6 +21,11 @@ source server_config.tcl fileeval $cfPath(velsel)/velsel.tcl fileeval $cfPath(motors)/motor_configuration.tcl +######## +# Parameters set above the restore command will be clobbered by +# the values in the status.tcl file +restore + fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl @@ -32,18 +37,17 @@ source gumxml.tcl #::histogram_memory::setmode pulser #::histogram_memory::setmode calibration ::histogram_memory::setmode normal -#::histogram_memory::hmm_initialize -::histogram_memory::hmm_setup transparent 0 3 oat_nyc_eff oat_nxc_eff oat_ntc_eff -hmm_start 0 +::histogram_memory::initialize 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 @@ -52,6 +56,7 @@ proc instrument_set_sobj_attributes {} { } instrument_set_sobj_attributes +} +server_set_sobj_attributes buildHDB instrument_dictionary -#buildHDB [instname]_dictionary fileeval extraconfig.tcl