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

Merge branch 'RELEASE-3_1' into RELEASE-3_2

Browse Source 
Conflicts:
	sics/site_ansto/instrument/dingo/dingo_configuration.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
This commit is contained in:
Douglas Clowes
2015-03-13 15:44:32 +11:00
parent b9954651d5 6ef97197ee
commit 9ee2252138
20 changed files with 1121 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/hrpd/config/motors/motor_configuration.tcl
View File

@@ -109,7 +109,7 @@ if { [ info exists ::config_dict ] } {
set implementation [ dict get $::config_dict sample_stage implementation ]
if {$implementation == "normal_sample_stage"} {
set axis_config 0
} elseif {$implementation == "eularian_cradle"} {
} elseif {$implementation == "eulerian_cradle"} {
set axis_config 1
} elseif {$implementation == "small_omega"} {
set axis_config 2