linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commands_common.tcl

Browse Source 
scan_common_t.tcl
Remove redundant filename entries from bmonscan and hmscan feedback

reflectometer/config/parameters/parameters.tcl
Put instrument parameters under hdb parameters section a la Quokka

r2645 | ffr | 2008-07-11 11:42:52 +1000 (Fri, 11 Jul 2008) | 7 lines
This commit is contained in:
Ferdi Franceschini
2008-07-11 11:42:52 +10:00
committed by Douglas Clowes
parent 01be487c52
commit 1f0f5fe72e
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/config/commands/commands_common.tcl
View File

@@ -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 ::scan::hdb_bmonscan -set feedback status IDLE
command hdb_hmscan { 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 ::scan::hdb_hmscan -set feedback status IDLE
} }
sicslist setatt ::scan::hdb_bmonscan long_name bmonscan sicslist setatt ::scan::hdb_bmonscan long_name bmonscan

1
site_ansto/instrument/config/scan/scan_common_1.tcl
View File

@@ -330,7 +330,6 @@ proc ::scan::bm_scan_prepare {sobj uobj} {
set vlist [split [$sobj getvarpar $varindex] = ] set vlist [split [$sobj getvarpar $varindex] = ]
set scanstart [lindex $vlist 1] set scanstart [lindex $vlist 1]
set scanstep [lindex $vlist 2] set scanstep [lindex $vlist 2]
::scan::hdb_bmonscan -set feedback filename [SplitReply [dataFileName]]
::scan::hdb_bmonscan -set NP $numpoints ::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_variable [string trim [lindex [split [lindex $vlist 0] . ] 1]];
::scan::hdb_bmonscan -set scan_start $scanstart ::scan::hdb_bmonscan -set scan_start $scanstart

5
site_ansto/instrument/reflectometer/config/parameters/parameters.tcl
View File

@@ -1,8 +1,7 @@
## ##
# @brief Instrument parameters # @brief Instrument parameters
# TODO There should be an NXgeometry entry for each distance, and linked to an NXgeometry # 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 # entry for the chopper [SICS-108].
# testing and development.
foreach vn { foreach vn {
detector_distance detector_distance
detector_base detector_base
@@ -13,7 +12,7 @@ foreach vn {
slit3_distance slit3_distance
slit3_base 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 detector_distance 10000