Make sure that scans only save scratch files if called with 'savetype nosave'

site_ansto/instrument/config/scan/scan_common_1.tcl

@@ -475,6 +475,7 @@ namespace eval scan {
       error "Number of points <$numpoints> must not be less than one"
     }
 
+    set save_filetype data
     foreach {arg val} $args {
       switch $arg {
         "force" {
@@ -667,6 +668,7 @@ namespace eval scan {
         set numpoints 1
       }
 
+      set save_filetype data
       foreach {arg val} $args {
         switch $arg {
           "force" {