diff --git a/site_ansto/instrument/config/beamline/he3_polanal_sct.tcl b/site_ansto/instrument/config/beamline/he3_polanal_sct.tcl index 752989e1..d29be32c 100644 --- a/site_ansto/instrument/config/beamline/he3_polanal_sct.tcl +++ b/site_ansto/instrument/config/beamline/he3_polanal_sct.tcl @@ -175,27 +175,9 @@ proc ::scobj::he3_polanal::setValue {tc_root nextState cmd_str} { set cmd "${cmd_str}${par}" # setValue hook code starts set cmd "${cmd_str}" - if {[string equal -nocase [sct target] "refresh"]} { - set cmd "${cmd_str}" - } - if {[string equal -nocase [sct target] "minus"]} { - set cmd "${cmd_str} -" - } - if {[string equal -nocase [sct target] "dn"]} { - set cmd "${cmd_str} -" - } - if {[string equal -nocase [sct target] "down"]} { - set cmd "${cmd_str} -" - } if {[sct target] == "-" || [sct target] == -1} { set cmd "${cmd_str} -" } - if {[string equal -nocase [sct target] "plus"]} { - set cmd "${cmd_str} +" - } - if {[string equal -nocase [sct target] "up"]} { - set cmd "${cmd_str} +" - } if {[sct target] == "+" || [sct target] == 1} { set cmd "${cmd_str} +" } @@ -318,12 +300,12 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/analyser/time2 type "part" hsetprop ${scobj_hpath}/analyser/time2 nxalias "${name}_analyser_time2" - hfactory ${scobj_hpath}/analyser/timestamp plain user float + hfactory ${scobj_hpath}/analyser/timestamp plain user int hsetprop ${scobj_hpath}/analyser/timestamp control true hsetprop ${scobj_hpath}/analyser/timestamp data true hsetprop ${scobj_hpath}/analyser/timestamp mutable true hsetprop ${scobj_hpath}/analyser/timestamp nxsave true - hsetprop ${scobj_hpath}/analyser/timestamp oldval 0.0 + hsetprop ${scobj_hpath}/analyser/timestamp oldval 0 hsetprop ${scobj_hpath}/analyser/timestamp klass "parameter" hsetprop ${scobj_hpath}/analyser/timestamp sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser/timestamp type "part" @@ -406,12 +388,12 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/analyser_start/time2 type "part" hsetprop ${scobj_hpath}/analyser_start/time2 nxalias "${name}_analyser_start_time2" - hfactory ${scobj_hpath}/analyser_start/timestamp plain user float + hfactory ${scobj_hpath}/analyser_start/timestamp plain user int hsetprop ${scobj_hpath}/analyser_start/timestamp control true hsetprop ${scobj_hpath}/analyser_start/timestamp data true hsetprop ${scobj_hpath}/analyser_start/timestamp mutable true hsetprop ${scobj_hpath}/analyser_start/timestamp nxsave true - hsetprop ${scobj_hpath}/analyser_start/timestamp oldval 0.0 + hsetprop ${scobj_hpath}/analyser_start/timestamp oldval 0 hsetprop ${scobj_hpath}/analyser_start/timestamp klass "parameter" hsetprop ${scobj_hpath}/analyser_start/timestamp sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/analyser_start/timestamp type "part" @@ -481,7 +463,7 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/polariser/spin data true hsetprop ${scobj_hpath}/polariser/spin mutable true hsetprop ${scobj_hpath}/polariser/spin nxsave true - hsetprop ${scobj_hpath}/polariser/spin values +,-,Refresh + hsetprop ${scobj_hpath}/polariser/spin values -1,0,+1 hsetprop ${scobj_hpath}/polariser/spin oldval 0.0 hsetprop ${scobj_hpath}/polariser/spin klass "parameter" hsetprop ${scobj_hpath}/polariser/spin sdsinfo "::nexus::scobj::sdsinfo" @@ -509,12 +491,12 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/polariser/time2 type "part" hsetprop ${scobj_hpath}/polariser/time2 nxalias "${name}_polariser_time2" - hfactory ${scobj_hpath}/polariser/timestamp plain user float + hfactory ${scobj_hpath}/polariser/timestamp plain user int hsetprop ${scobj_hpath}/polariser/timestamp control true hsetprop ${scobj_hpath}/polariser/timestamp data true hsetprop ${scobj_hpath}/polariser/timestamp mutable true hsetprop ${scobj_hpath}/polariser/timestamp nxsave true - hsetprop ${scobj_hpath}/polariser/timestamp oldval 0.0 + hsetprop ${scobj_hpath}/polariser/timestamp oldval 0 hsetprop ${scobj_hpath}/polariser/timestamp klass "parameter" hsetprop ${scobj_hpath}/polariser/timestamp sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser/timestamp type "part" @@ -597,12 +579,12 @@ proc ::scobj::he3_polanal::mkDriver { sct_controller name device_class simulatio hsetprop ${scobj_hpath}/polariser_start/time2 type "part" hsetprop ${scobj_hpath}/polariser_start/time2 nxalias "${name}_polariser_start_time2" - hfactory ${scobj_hpath}/polariser_start/timestamp plain user float + hfactory ${scobj_hpath}/polariser_start/timestamp plain user int hsetprop ${scobj_hpath}/polariser_start/timestamp control true hsetprop ${scobj_hpath}/polariser_start/timestamp data true hsetprop ${scobj_hpath}/polariser_start/timestamp mutable true hsetprop ${scobj_hpath}/polariser_start/timestamp nxsave true - hsetprop ${scobj_hpath}/polariser_start/timestamp oldval 0.0 + hsetprop ${scobj_hpath}/polariser_start/timestamp oldval 0 hsetprop ${scobj_hpath}/polariser_start/timestamp klass "parameter" hsetprop ${scobj_hpath}/polariser_start/timestamp sdsinfo "::nexus::scobj::sdsinfo" hsetprop ${scobj_hpath}/polariser_start/timestamp type "part"