From 78c42a2427322df7f5cbc87b9d5d956da42a5707 Mon Sep 17 00:00:00 2001
From: Ferdi Franceschini <ffr@ansto.gov.au>
Date: Wed, 26 Sep 2007 16:13:03 +1000
Subject: [PATCH] Don't set plottable data links and data save policy here,
 this is now taken care of when setting the data file policy with the
 'newfile' command. Only check if  scan variables of type=motor are locked (ie
 'fixed') in position before running a scan.

r2161 | ffr | 2007-09-26 16:13:03 +1000 (Wed, 26 Sep 2007) | 3 lines
---
 .../instrument/config/scan/scan_common_1.tcl    | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/site_ansto/instrument/config/scan/scan_common_1.tcl b/site_ansto/instrument/config/scan/scan_common_1.tcl
index e1609f1a..2110c45b 100644
--- a/site_ansto/instrument/config/scan/scan_common_1.tcl
+++ b/site_ansto/instrument/config/scan/scan_common_1.tcl
@@ -58,7 +58,7 @@ proc check_limit {scan_variable limit_name target} {
     set scan_variable [string trim [lindex [split [lindex $vlist 0] . ] 1]]
     set scan_start [lindex $vlist 1];
     set scan_increment [lindex $vlist 2];
-    if {[getatt $scan_variable type] != "configurablevirtualmotor"} {
+    if {[getatt $scan_variable type] == "motor"} {
     if {[SplitReply [$scan_variable fixed]] >= 0} {
       return -code error "Scan aborted. $scan_variable position is set to 'fixed'"
     }
@@ -87,9 +87,8 @@ proc check_limit {scan_variable limit_name target} {
     ::scan::hdb_hmscan -set feedback status BUSY
 
     ::histogram_memory::prepare 
+    ::nexus::newfile HISTOGRAM_XYT data 
     data axis 1 [::scan::hdb_hmscan -set scan_variable]
-    ::hdb::set_save / true
-    ::nexus::newfile data 
   }
 
   proc hmm_count {sobj uobj point mode preset} {
@@ -110,8 +109,7 @@ proc check_limit {scan_variable limit_name target} {
     ::scan::hdb_hmscan -set feedback status IDLE
     # Make sure that the next save command doesn't overwrite our scan data.
     # and clear any data links
-    ::nexus::newfile data
-    ::nexus::data clear
+    ::nexus::newfile clear data
     if {$reset_position == "true"} {
       set svar [::scan::hdb_hmscan -get scan_variable]
       set svtype [getatt $svar type]
@@ -128,8 +126,7 @@ proc check_limit {scan_variable limit_name target} {
     ::scan::hdb_bmonscan -set feedback status IDLE
     # Make sure that the next save command doesn't overwrite our scan data.
     # and clear any data links
-    ::nexus::newfile data
-    ::nexus::data clear
+    ::nexus::newfile clear data
     if {$reset_position == "true"} {
       set svar [::scan::hdb_bmonscan -get scan_variable]
       set svtype [getatt $svar type]
@@ -213,10 +210,8 @@ proc check_limit {scan_variable limit_name target} {
     #FIXME remove dependency on hdb path
     
     array set bm_fb [::scan::hdb_bmonscan -list feedback]
-    data axis 1 [::scan::hdb_bmonscan -set scan_variable]
-    ::hdb::set_save / true
-    ::hdb::set_save /instrument/detector false
-    ::nexus::newfile data
+    ::nexus::newfile BEAM_MONITOR data
+    ::nexus::data axis 1 [::scan::hdb_bmonscan -set scan_variable]
     #stdscan prepare $sobj $uobj;
   }