diff --git a/site_ansto/instrument/config/scan/scan_common_1.tcl b/site_ansto/instrument/config/scan/scan_common_1.tcl index 9325942a..88acc78a 100644 --- a/site_ansto/instrument/config/scan/scan_common_1.tcl +++ b/site_ansto/instrument/config/scan/scan_common_1.tcl @@ -174,6 +174,8 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1 } proc commands_hpath_setup {parent} { + set feedbackPath $parent/bmonscan/feedback + hcommand $parent/bmonscan hdb_bmonscan hsetprop $parent/bmonscan type command hsetprop $parent/bmonscan priv user @@ -203,15 +205,18 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1 hsetprop $parent/bmonscan/channel max [SplitReply [bmonscan getnumchan]] # Optional feedback node - hmake $parent/bmonscan/feedback spy none - hattach $parent/bmonscan/feedback dataFileName filename - hattach $parent/bmonscan/feedback bmonscan_mode mode - hattach $parent/bmonscan/feedback bmonscan_preset preset - hmake $parent/bmonscan/feedback/scan_variable spy none - hattach $parent/bmonscan/feedback/scan_variable bmonscan_var_value value - hmake $parent/bmonscan/feedback/NP spy none - hattach $parent/bmonscan/feedback/NP bmonscan_point_current current - hattach $parent/bmonscan/feedback bmonscan_counts counts; + hmake $feedbackPath spy none + hattach $feedbackPath dataFileName filename + hattach $feedbackPath bmonscan_mode mode + hattach $feedbackPath bmonscan_preset preset + hmake $feedbackPath/scan_variable spy none + hattach $feedbackPath/scan_variable bmonscan_var_value value + hmake $feedbackPath/NP spy none + hattach $feedbackPath/NP bmonscan_point_current current + hattach $feedbackPath bmonscan_counts counts; + foreach fbNode [hlist $feedbackPath] { + hsetprop $feedbackPath/$fbNode privilege READ_ONLY; + } #TODO Histogram memory scan command } @@ -222,8 +227,8 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1 variable bmoncounts_array variable bmoncounts_axis - set bmonscanvar_axis_hpath $parent/beam_monitor_scan/scan_axis - set bmonscancounts_array_hpath $parent/beam_monitor_scan/counts + set bmonscanvar_axis_hpath $parent/beam_monitor_scan/axis + set bmonscancounts_array_hpath $parent/beam_monitor_scan/data set defdim 100 hmake $parent/beam_monitor_scan spy none; hsetprop $parent/beam_monitor_scan type graphdata; @@ -231,10 +236,8 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1 hsetprop $parent/beam_monitor_scan rank 1; hattach $parent/beam_monitor_scan bmonscan_np_target dim; hattach $parent/beam_monitor_scan bmonscan_point_current point; - hmake $parent/beam_monitor_scan/scan_variable spy none - hattach $parent/beam_monitor_scan/scan_variable bmonscan_var_value value - hmake $parent/beam_monitor_scan/scan_counts spy none - hattach $parent/beam_monitor_scan/scan_counts bmonscan_counts value + hattach $parent/beam_monitor_scan bmonscan_var_value lastaxis + hattach $parent/beam_monitor_scan bmonscan_counts lastdata hmakescript $bmonscanvar_axis_hpath "set ::scancommand::bmoncounts_axis" hdbReadOnly floatvarar $defdim hsetprop $bmonscanvar_axis_hpath type axis sicspoll del $bmonscanvar_axis_hpath