diff --git a/site_ansto/instrument/config/commands/commands_common.tcl b/site_ansto/instrument/config/commands/commands_common.tcl index 12faefd1..037d11bc 100644 --- a/site_ansto/instrument/config/commands/commands_common.tcl +++ b/site_ansto/instrument/config/commands/commands_common.tcl @@ -29,7 +29,7 @@ command hdb_bmonscan { } -::scan::hdb_bmonscan -addfb text filename text mode float preset float scan_variable_value int scanpoint int counts text status +::scan::hdb_bmonscan -addfb text mode float preset float scan_variable_value int scanpoint int counts text status ::scan::hdb_bmonscan -set feedback status IDLE command hdb_hmscan { @@ -56,7 +56,7 @@ command hdb_hmscan { } -::scan::hdb_hmscan -addfb text filename text mode float preset float scan_variable_value int scanpoint int counts text status +::scan::hdb_hmscan -addfb text mode float preset float scan_variable_value int scanpoint int counts text status ::scan::hdb_hmscan -set feedback status IDLE } sicslist setatt ::scan::hdb_bmonscan long_name bmonscan diff --git a/site_ansto/instrument/config/scan/scan_common_1.tcl b/site_ansto/instrument/config/scan/scan_common_1.tcl index 238c173d..2f8f1761 100644 --- a/site_ansto/instrument/config/scan/scan_common_1.tcl +++ b/site_ansto/instrument/config/scan/scan_common_1.tcl @@ -330,7 +330,6 @@ proc ::scan::bm_scan_prepare {sobj uobj} { set vlist [split [$sobj getvarpar $varindex] = ] set scanstart [lindex $vlist 1] set scanstep [lindex $vlist 2] - ::scan::hdb_bmonscan -set feedback filename [SplitReply [dataFileName]] ::scan::hdb_bmonscan -set NP $numpoints ::scan::hdb_bmonscan -set scan_variable [string trim [lindex [split [lindex $vlist 0] . ] 1]]; ::scan::hdb_bmonscan -set scan_start $scanstart diff --git a/site_ansto/instrument/reflectometer/config/parameters/parameters.tcl b/site_ansto/instrument/reflectometer/config/parameters/parameters.tcl index 7c2d7d18..17699aab 100644 --- a/site_ansto/instrument/reflectometer/config/parameters/parameters.tcl +++ b/site_ansto/instrument/reflectometer/config/parameters/parameters.tcl @@ -1,8 +1,7 @@ ## # @brief Instrument parameters # TODO There should be an NXgeometry entry for each distance, and linked to an NXgeometry -# entry for the chopper [SICS-108]. We put them in a junk entry for now to avoid holding up -# testing and development. +# entry for the chopper [SICS-108]. foreach vn { detector_distance detector_base @@ -13,7 +12,7 @@ foreach vn { slit3_distance slit3_base } { - ::utility::mkVar $vn float manager $vn true junk true true + ::utility::mkVar $vn float manager $vn true parameter true true } detector_distance 10000