diff --git a/site_ansto/instrument/tas/config/commands/commands.tcl b/site_ansto/instrument/tas/config/commands/commands.tcl index a8dfeb1f..ab06046d 100644 --- a/site_ansto/instrument/tas/config/commands/commands.tcl +++ b/site_ansto/instrument/tas/config/commands/commands.tcl @@ -1,3 +1,5 @@ +# Author : Jing Chen (jgn@ansto.gov.au) + source $cfPath(commands)/commands_common.tcl namespace eval motor { diff --git a/site_ansto/instrument/tas/config/hipadaba/hpaths.tcl b/site_ansto/instrument/tas/config/hipadaba/hpaths.tcl deleted file mode 100644 index 142374a0..00000000 --- a/site_ansto/instrument/tas/config/hipadaba/hpaths.tcl +++ /dev/null @@ -1,33 +0,0 @@ -set hpaths [list experiment ] - -# Maps devices (eg motors) to hipadaba paths. -# obj name path -set motor_hpath [list \ -aperture slits \ -attenuator attenuator \ -collimator collimator \ -detector detector \ -polarizer polarizer \ -sample sample ] - - -# Configurable virtual motors -# obj name path master_obj -set cvirtmotor_hpath [list \ -ss1hg gap slits/1/horizontal [list left right]\ -ss1ho offset slits/1/horizontal [list left right]\ -ss1vg gap slits/1/vertical [list upper lower]\ -ss1vo offset slits/1/vertical [list upper lower]\ -ss2hg gap slits/2/horizontal [list left right]\ -ss2ho offset slits/2/horizontal [list left right]\ -ss2vg gap slits/2/vertical [list upper lower]\ -ss2vo offset slits/2/vertical [list upper lower]\ -ss3hg gap slits/3/horizontal [list left right]\ -ss3ho offset slits/3/horizontal [list left right]\ -ss3vg gap slits/3/vertical [list upper lower]\ -ss3vo offset slits/3/vertical [list upper lower]\ -ss4hg gap slits/4/horizontal [list left right]\ -ss4ho offset slits/4/horizontal [list left right]\ -ss4vg gap slits/4/vertical [list upper lower]\ -ss4vo offset slits/4/vertical [list upper lower]] - diff --git a/site_ansto/instrument/tas/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/tas/config/hmm/hmm_configuration.tcl index 2f2ac231..c823c109 100644 --- a/site_ansto/instrument/tas/config/hmm/hmm_configuration.tcl +++ b/site_ansto/instrument/tas/config/hmm/hmm_configuration.tcl @@ -2,63 +2,6 @@ source $cfPath(hmm)/hmm_configuration_common_1.tcl set sim_mode [SplitReply [hmm_simulation]] -proc ::histogram_memory::init_OAT_TABLE {} { - if [ catch { - # We don't need a MAX_CHAN parameter for time because the time channel - # is scaled by calling the ::histogram_memory::clock_scale function - OAT_TABLE X -setdata MAX_CHAN 192 - OAT_TABLE Y -setdata MAX_CHAN 192 - OAT_TABLE X -setdata BMIN -0.5 - OAT_TABLE X -setdata BMAX 191.5 - OAT_TABLE Y -setdata BMIN -0.5 - OAT_TABLE Y -setdata BMAX 191.5 - - OAT_TABLE -set X { 191.5 190.5 } NXC 192 Y { -0.5 0.5 } NYC 192 T { 0 20000 } NTC 1 - } message ] { - return -code error $message - } -} -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 - - # hmm configure FAT_SIMULATED_EVENT_Y0 $y_bb0 - # hmm configure FAT_SIMULATED_EVENT_Y1 $ybbmax - # hmm configure FAT_SIMULATED_EVENT_X0 $x_bb0 - # hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax - ::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 - } -} -publish isc_initialize user - proc histmem {cmd args} { eval "_histmem $cmd $args" } diff --git a/site_ansto/instrument/tas/config/nexus/nxscripts.tcl b/site_ansto/instrument/tas/config/nexus/nxscripts.tcl index ea5459df..b1ad4365 100644 --- a/site_ansto/instrument/tas/config/nexus/nxscripts.tcl +++ b/site_ansto/instrument/tas/config/nexus/nxscripts.tcl @@ -1,13 +1,5 @@ source $cfPath(nexus)/nxscripts_common_1.tcl proc ::nexus::isc_initialize {} { -if {0} { - variable histmem_filetype_spec - foreach spec [array names histmem_filetype_spec] { - lappend histmem_filetype_spec($spec) link {aux_data 3 LambdaA} - lappend histmem_filetype_spec($spec) link {aux_data 4 Transmission} - lappend histmem_filetype_spec($spec) link {aux_data 5 ::histogram_memory::x_bin} - lappend histmem_filetype_spec($spec) link {aux_data 6 ::histogram_memory::y_bin} - } } ::nexus::ic_initialize } diff --git a/site_ansto/instrument/tas/config/plc/plc.tcl b/site_ansto/instrument/tas/config/plc/plc.tcl index 006047be..b3d685ba 100644 --- a/site_ansto/instrument/tas/config/plc/plc.tcl +++ b/site_ansto/instrument/tas/config/plc/plc.tcl @@ -1,7 +1,7 @@ set sim_mode [SplitReply [plc_simulation]] if {$sim_mode == "false"} { - MakeAsyncQueue plc_chan SafetyPLC 137.157.204.79 31001 - MakeSafetyPLC plc plc_chan 0 +# MakeAsyncQueue plc_chan SafetyPLC 137.157.204.79 31001 +# MakeSafetyPLC plc plc_chan 0 } source $cfPath(plc)/plc_common_1.tcl diff --git a/site_ansto/instrument/tas/config/source/source.tcl b/site_ansto/instrument/tas/config/source/source.tcl index 730c4f55..50967ab8 100644 --- a/site_ansto/instrument/tas/config/source/source.tcl +++ b/site_ansto/instrument/tas/config/source/source.tcl @@ -1,6 +1,8 @@ +# Author Jing Chen (jgn@ansto.gov.au) + source $cfPath(source)/source_common.tcl proc ::source::isc_initialize {} { - ::source::ic_initialize "cold" + ::source::ic_initialize "thermal" }