Merged in-situ modifications for Release 2.5 candidate 5

r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
This commit is contained in:
Ferdi Franceschini
2010-04-29 16:02:15 +10:00
committed by Douglas Clowes
parent a2ca46ab67
commit e6e3c3be52
24 changed files with 478 additions and 363 deletions

View File

@@ -242,6 +242,7 @@ proc ::scan::hmm_scan_finish {sobj uobj} {
::histogram_memory::stop
::scan::runscan_cmd -set feedback status IDLE
run_mode "normal"
set ::histogram_memory::histmem_axes(SVAR) "/instrument/run_number"
# Make sure that the next save command doesn't overwrite our scan data.
# and clear any data links
::nexus::newfile clear data
@@ -260,6 +261,7 @@ proc ::scan::bm_scan_finish {sobj uobj} {
variable reset_position
::scan::hdb_bmonscan -set feedback status IDLE
run_mode "normal"
set ::histogram_memory::histmem_axes(SVAR) "/instrument/run_number"
# Make sure that the next save command doesn't overwrite our scan data.
# and clear any data links
::nexus::newfile clear data