linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Platypus' into RELEASE-3_1

Browse Source
This commit is contained in:
Douglas Clowes
2015-04-17 12:52:59 +10:00
parent 1a93e494d9 843a9f46be
commit 2925bdedc5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
site_ansto/instrument/reflectometer/config/hmm/hmm_configuration.tcl
View File

@ -19,7 +19,8 @@ proc ::histogram_memory::init_OAT_TABLE {} {
hmm configure fat_frame_source EXTERNAL 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 { -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 ] { } message ] {
if {$::errorCode=="NONE"} {return $message} if {$::errorCode=="NONE"} {return $message}
return -code error $message return -code error $message

2
site_ansto/instrument/reflectometer/platypus_configuration.tcl
View File

@ -27,6 +27,7 @@ fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(counter)/counter.tcl
fileeval $cfPath(environment)/sct_syr.tcl fileeval $cfPath(environment)/sct_syr.tcl
fileeval $cfPath(environment)/sct_syringe_pump.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_knauer_pump.tcl
fileeval $cfPath(environment)/sct_mvp.tcl fileeval $cfPath(environment)/sct_mvp.tcl
fileeval $cfPath(environment)/sct_mvp_valve.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_ls336.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/sct_ls340.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(environment)/temperature/sct_julabo_lh45_gen.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl fileeval $cfPath(environment)/temperature/sct_oxford_mercury.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl