diff --git a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl index 86a213b8..8a84cea7 100644 --- a/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl +++ b/site_ansto/instrument/hipd/config/motors/motor_configuration.tcl @@ -107,6 +107,20 @@ set move_count 10 # 3: Oxford magnet sample stick set axis_config 0 +if { [ info exists ::config_dict ] } { + if {[ dict get $::config_dict normal_sample_stage enabled ] } { + set axis_config 0 + } elseif {[ dict get $::config_dict eularian_cradle enabled ] } { + set axis_config 1 + } elseif {[ dict get $::config_dict small_omega enabled ] } { + set axis_config 2 + } elseif {[ dict get $::config_dict 12tmagnet_sample_insert enabled ] } { + set axis_config 3 + } else { + set axis_config 0 + } +} + switch $axis_config { 0 { set sample_stage_rotate "som" diff --git a/site_ansto/instrument/hipd/util/sics_config.ini b/site_ansto/instrument/hipd/util/sics_config.ini index d2ae2724..90264a80 100644 --- a/site_ansto/instrument/hipd/util/sics_config.ini +++ b/site_ansto/instrument/hipd/util/sics_config.ini @@ -2,6 +2,7 @@ cascade = 12tmagnet,12tmagnet_sample_insert,mercury_scipi enabled = False group = 0setup +onifoff = normal_sample_stage [12tmagnet] desc = "12 Tesla Oxford Magnet" @@ -91,10 +92,33 @@ port = 7020 tol = 2.0 terminator = \r -[12tmagnet_sample_insert] -desc = "REVIEW THIS -> som will be redefined as the sample insert rotation. Sample stage will be renamed to somss" +[normal_sample_stage] +desc = "This is the default sample stage configuration with xy translation and phi and chi tilt stages" +enabled = True +group = motors +offifon = eularian_cradle,small_omega,12tmagnet_sample_insert +radio=samstage + +[eularian_cradle] +desc = "Load the Eulerian cradle configuration" enabled = False group = motors +offifon = normal_sample_stage,small_omega,12tmagnet_sample_insert +radio=samstage + +[small_omega] +desc = "Load the small omega configuration" +enabled = False +group = motors +offifon = normal_sample_stage,eularian_cradle,12tmagnet_sample_insert +radio=samstage + +[12tmagnet_sample_insert] +desc = "som will be redefined as the magnet sample insert rotation. Sample stage will be renamed to somss" +enabled = False +group = motors +offifon = normal_sample_stage,eularian_cradle,small_omega +radio=samstage [west4100] desc = "tc1: Blue furnace temperature controller"