From 843a9f46bec265c829bb98f4d1d31a9bc59f5ce5 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Fri, 17 Apr 2015 12:52:17 +1000 Subject: [PATCH] Pullback changes from Platypus --- .../instrument/reflectometer/config/hmm/hmm_configuration.tcl | 3 ++- site_ansto/instrument/reflectometer/platypus_configuration.tcl | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl b/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl index 747c6986..8dc46750 100644 --- a/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl +++ b/site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl @@ -19,7 +19,8 @@ proc ::histogram_memory::init_OAT_TABLE {} { hmm configure fat_frame_source EXTERNAL # OAT_TABLE -set X { -210.5 -209.5 } NXC 421 Y { -110.5 -109.5 } NYC 221 T { 0 40 } NTC 1000 - OAT_TABLE -set X { 56.5 -56.5 } NXC 1 Y { 110.5 109.5 } NYC 221 T { 0 40 } NTC 1000 +# OAT_TABLE -set X { 56.5 -56.5 } NXC 1 Y { 110.5 109.5 } NYC 221 T { 0 40 } NTC 1000 + OAT_TABLE -set X { 60.5 -60.5 } NXC 1 Y { 110.5 109.5 } NYC 221 T { 0 40 } NTC 1000 } message ] { if {$::errorCode=="NONE"} {return $message} return -code error $message diff --git a/site_ansto/instrument/reflectometer/platypus_configuration.tcl b/site_ansto/instrument/reflectometer/platypus_configuration.tcl index 7cefb18d..ac3a6946 100644 --- a/site_ansto/instrument/reflectometer/platypus_configuration.tcl +++ b/site_ansto/instrument/reflectometer/platypus_configuration.tcl @@ -27,6 +27,7 @@ fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(environment)/sct_syr.tcl fileeval $cfPath(environment)/sct_syringe_pump.tcl +fileeval $cfPath(environment)/isotech_ps_sct.tcl fileeval $cfPath(environment)/sct_knauer_pump.tcl fileeval $cfPath(environment)/sct_mvp.tcl fileeval $cfPath(environment)/sct_mvp_valve.tcl @@ -40,6 +41,7 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl fileeval $cfPath(environment)/temperature/sct_ls336.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(environment)/temperature/sct_ls340.tcl +fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(nexus)/nxscripts.tcl