diff --git a/site_ansto/instrument/config/commands/commands_common.tcl b/site_ansto/instrument/config/commands/commands_common.tcl index aefde99c..6ebeeca0 100644 --- a/site_ansto/instrument/config/commands/commands_common.tcl +++ b/site_ansto/instrument/config/commands/commands_common.tcl @@ -5,7 +5,8 @@ namespace eval commands { } proc ::commands::ic_initialize {} { -namespace eval ::histogram { +if {[info procs "histmem" ] != ""} { + namespace eval ::histogram { set NS [namespace current] variable parameters array set parameters {mode UNKNOWN preset UNKNOWN freq UNKNOWN frame_source UNKNOWN} @@ -70,6 +71,7 @@ namespace eval ::histogram { ::histogram::histmem_cmd -set feedback status IDLE sicslist setatt ::histogram::histmem_cmd long_name histmem sicslist setatt ::histogram::histmem_cmd id histmem + } } # SCAN COMMANDS namespace eval ::scan { diff --git a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl index bbb2e5e9..dd22fa3b 100644 --- a/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl +++ b/site_ansto/instrument/config/nexus/nxscripts_common_1.tcl @@ -50,6 +50,7 @@ namespace eval nexus { "quokka" "fname" "platypus" "simple" "lyrebird" "simple" + "taipan" "simple" } } namespace eval ::nexus::histmem {} diff --git a/site_ansto/instrument/tas/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/tas/config/hmm/hmm_configuration.tcl index 4f4f9e51..16ed76f3 100644 --- a/site_ansto/instrument/tas/config/hmm/hmm_configuration.tcl +++ b/site_ansto/instrument/tas/config/hmm/hmm_configuration.tcl @@ -1,49 +1,8 @@ -# Author Jing Chen (jgn@ansto.gove.au) -# Note: all following functions's bodies need to be implemented in real Taipan deployment +namespace eval histogram_memory { + # Define HP_HMM to make nxscripts_common_1.tcl::nexus::process_filetype_policy happy when setting filetype=BEAM_MONITOR + set HP_HMM "" -source $cfPath(hmm)/hmm_configuration_common_1.tcl -set sim_mode [SplitReply [hmm_simulation]] - -proc ::histogram_memory::init_OAT_TABLE {} { -} - -proc ::histogram_memory::pre_count {} {} -proc ::histogram_memory::post_count {} {} -proc ::histogram_memory::isc_initialize {} { - # Instrument specific X and Y dimension names - #variable INST_NXC "oat_nxc_eff" - #variable INST_NYC "oat_nyc_eff" - - if [ catch { - ::histogram_memory::init_hmm_objs - if {$::sim_mode == "true"} { - #hmm configure oat_ntc_eff 1 - #hmm configure $INST_NYC 127 - #hmm configure $INST_NXC 127 - } - #BAT_TABLE -init - #CAT_TABLE -init - #SAT_TABLE -init - #OAT_TABLE -init - #FAT_TABLE -init - ::histogram_memory::ic_initialize - - #detector_active_height_mm [expr 5.08 * 192] - #detector_active_width_mm [expr 5.08 * 192] - #detector_active_height_mm lock - #detector_active_width_mm lock - - ::histogram_memory::init_OAT_TABLE - ::histogram_memory::upload_config Filler_defaults - - #set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_offset - #set ::histogram_memory::histmem_axes(VER) /instrument/detector/y_pixel_offset - } message ] { - return -code error $message + # Define isc_initialize to give server_config.tcl:server_init something to call + proc isc_initialize {} { } } - -proc histmem {cmd args} { - eval "_histmem $cmd $args" -} -publish histmem user diff --git a/site_ansto/instrument/tas/config/motors/positmotor_configuration.tcl b/site_ansto/instrument/tas/config/motors/positmotor_configuration.tcl index 6f383fc0..237c0f08 100644 --- a/site_ansto/instrument/tas/config/motors/positmotor_configuration.tcl +++ b/site_ansto/instrument/tas/config/motors/positmotor_configuration.tcl @@ -1,60 +1,3 @@ # Author: Jing Chen (jgn@ansto.gov.au) source $cfPath(motors)/sct_positmotor_common.tcl - -set port1 [portnum pmc1-taipan] -set port2 [portnum pmc2-taipan] -set port3 [portnum pmc3-taipan] -set port4 [portnum pmc4-taipan] -set port5 [portnum pmc5-taipan] -set port6 [portnum pmc6-taipan] - -makesctcontroller sct_mc1 std mc1-taipan:$port1 -makesctcontroller sct_mc2 std mc2-taipan:$port2 -makesctcontroller sct_mc3 std mc3-taipan:$port3 -makesctcontroller sct_mc4 std mc4-taipan:$port4 -makesctcontroller sct_mc5 std mc5-taipan:$port5 -makesctcontroller sct_mc6 std mc6-taipan:$port6 - -# label pos -#index position -set 20sample_table { - 1 453.7 - 2 411.7 - 3 369.7 - 4 327.7 - 5 285.7 - 6 203.7 - 7 161.7 - 8 119.7 - 9 77.7 - 10 35.7 - 11 -46.3 - 12 -88.3 - 13 -130.3 - 14 -172.3 - 15 -214.3 - 16 -296.3 - 17 -338.3 - 18 -380.3 - 19 -422.3 - 20 -464.3 -} - -#mkPosit sct_mc1 sampleNum float samx sample $20sample_table - -#diameter position -set auto_ap_table { - 2.5 0 - 5.0 -23 - 7.5 -47 - 10.0 -72 - 12.5 -98 - 15.0 -125 - 17.5 -153 - 20.0 -183 - 25.0 -215 - 30.0 -250 -} -#mkPosit sct_mc3 diameter float apx sample $auto_ap_table -