diff --git a/site_ansto/instrument/sans/util/sics_config.ini b/site_ansto/instrument/sans/util/sics_config.ini index a83b0624..e4712f48 100644 --- a/site_ansto/instrument/sans/util/sics_config.ini +++ b/site_ansto/instrument/sans/util/sics_config.ini @@ -1,8 +1,14 @@ -[sample_stage] -enabled = Always -implementation = normal_sample_stage -name = sample_stage -optype = motion_axis +[10_pos_sample_stage] +desc = "Load the ten position sample changer configuration" +imptype = motion_axis + +[10_position_setup] +cascade = T1:watlow_rm,sample_stage:10_pos_sample_stage +enabled = False + +[12Tmagnet_setup] +cascade = B1:12tmagnet_oxford,sample_stage:Oxford_12tmagnet_sample_insert,T1:mercury_scpi_01 +enabled = False [12tmagnet_oxford] desc = "12 Tesla Oxford Magnet" @@ -11,29 +17,9 @@ imptype = magnetic_field ip = 10.157.205.3 port = 55001 -[bruker_bec1] -desc = "Bruker Magnet" -driver = "bruker_bec1" -type = B -imptype = magnetic_field -ip = 10.157.205.13 -port = 4444 - -[rhqc_setup] -cascade = sample_stage:normal_sample_stage,T1:ls340_01,T2:ls340_02 -enabled = False - -[bruker_setup] -cascade = B1:bruker_bec1,sample_stage:normal_sample_stage,T1:julabo_lh45 -enabled = False - -[12Tmagnet_setup] -cascade = B1:12tmagnet_oxford,sample_stage:Oxford_12tmagnet_sample_insert,T1:mercury_scpi_01 -enabled = False - -[10_position_setup] -cascade = T1:watlow_rm,sample_stage:10_pos_sample_stage -enabled = False +[20_pos_sample_stage] +desc = "Load the twenty position sample changer configuration" +imptype = motion_axis [20_position_setup] cascade = T1:julabo_lh45,sample_stage:20_pos_sample_stage @@ -135,6 +121,28 @@ implementation = none name = volts2 optype = multimeter +[bruker_bec1] +desc = "Bruker Magnet" +driver = "bruker_bec1" +imptype = magnetic_field +ip = 10.157.205.13 +port = 4444 +type = B + +[bruker_setup] +cascade = B1:bruker_bec1,sample_stage:normal_sample_stage,T1:julabo_lh45 +enabled = False + +[julabo_lh45] +ctrl_sensor = "bath" +desc = "Julabo temperature controller" +driver = "julabo_lh45" +imptype = temperature +ip = 10.157.205.39 +port = 4001 +tol = 5.0 +type = T + [ls336_01] desc = "tc1: Lakeshore 336 temperature controller" driver = "lakeshore_336" @@ -242,49 +250,30 @@ valve_tol = 2 desc = "This is the default sample stage configuration xyz translation omega rotation but no tilt axes" imptype = motion_axis -[10_pos_sample_stage] -desc = "Load the ten position sample changer configuration" -imptype = motion_axis - -[20_pos_sample_stage] -desc = "Load the twenty position sample changer configuration" -imptype = motion_axis - [protek_01] desc = "Protek Multimeter" -driver = "protek" +driver = "protekmm" imptype = multimeter ip = 10.157.205.36 port = 4001 [protek_02] desc = "Protek Multimeter" -driver = "protek" +driver = "protekmm" imptype = multimeter ip = 10.157.205.37 port = 4001 +[rhqc_setup] +cascade = sample_stage:normal_sample_stage,T1:ls340_01,T2:ls340_02 +enabled = False + [sample_stage] enabled = Always implementation = normal_sample_stage name = sample_stage optype = motion_axis -[west4100] -desc = "Blue furnace temperature controller" -driver = "west4100" -imptype = temperature -ip = 10.157.205.19 - -[julabo_lh45] -desc = "Julabo temperature controller" -driver = "julabo_lh45" -imptype = temperature -ip = ca4-quokka -port = 4003 -terminator = \r\n -tol = 0.5 - [watlow_rm] desc = "Watlow RM temperature controller" driver = "watlow_rm" @@ -293,3 +282,10 @@ ip = 10.157.205.6 terminator = \r\n tol = 0.5 type = T + +[west4100] +desc = "Blue furnace temperature controller" +driver = "west4100" +imptype = temperature +ip = 10.157.205.19 +