diff --git a/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl b/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl index 3796d546..33455ae9 100644 --- a/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl +++ b/site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl @@ -1,5 +1,5 @@ -# $Revision: 1.13 $ -# $Date: 2007-04-23 00:34:44 $ +# $Revision: 1.14 $ +# $Date: 2007-05-08 04:58:51 $ # Author: Mark Lesha (mle@ansto.gov.au) # Last revision by: $Author: ffr $ @@ -18,6 +18,17 @@ VarMake hmm_bank Int User VarMake hmm_rank Int User VarMake hmm_start Int User VarMake hmm_length Int User +VarMake hmm_mode Text User +VarMake _hmm_vert_axis Text User +VarMake _hmm_hor_axis Text User +VarMake _hmm_hor_axis_alias Text User +VarMake _hmm_vert_axis_alias Text User +VarMake _hmm_hor_channel_name Text User +_hmm_vert_axis y_pixel_offset +_hmm_vert_axis_alias dvaxis +_hmm_hor_axis polar_angle +_hmm_hor_axis_alias dtheta +_hmm_hor_channel_name horizontal_channel_number ############################################## # Creating the histogram memories in SICS ############################################## @@ -389,19 +400,25 @@ proc count_withbm {mode preset} { proc experiment_hpath_setup {parent} { } - proc save {} { + proc save {point } { #TODO maybe add nxobj and point parameters. - set point 0 - nxcreatefile nexus_hmscan.dic; + set hor_axis [SplitReply [_hmm_hor_axis]] + set vert_axis [SplitReply [_hmm_vert_axis]] +# set point 0 + if {$point == 0} { + nxcreatefile nexus_hmscan.dic; + } else { + nxreopenfile + } nxscript putattribute program_name run_mode hmmcount hmm_save nxscript entry1 $point; nxscript_data clear; nxscript_data putint 0 $point; nxscript putslab erun [list $point] [list 1] nxscript_data; - nxscript putattribute erun axis 1; nxscript makelink scanvar erun; + nxscript putattribute erun axis 1; nxscript putattribute hmcounts signal 1; - nxscript putattribute hmcounts axes run_number:y_pixel_offset:x_pixel_offset; + nxscript putattribute hmcounts axes run_number:$vert_axis:$hor_axis; nxclosefile; } }