diff --git a/site_ansto/instrument/sans/util/sics_config.ini b/site_ansto/instrument/sans/util/sics_config.ini index e4712f48..76189b90 100644 --- a/site_ansto/instrument/sans/util/sics_config.ini +++ b/site_ansto/instrument/sans/util/sics_config.ini @@ -1,14 +1,96 @@ -[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 +[20_position_setup] +cascade = T1:julabo_lh45,sample_stage:20_pos_sample_stage +enabled = False +[CF1] +cascade = T1:CF1_ls340,sample_stage:normal_sample_stage +enabled = False +[Default] +cascade = sample_stage:normal_sample_stage +enabled = True +[bruker_setup] +cascade = B1:bruker_bec1,sample_stage:normal_sample_stage,T1:julabo_lh45 +enabled = False +[rhqc_setup] +cascade = sample_stage:normal_sample_stage,T1:ls340_01,T2:ls340_02 +enabled = False +[B1] +enabled = False +id = 1 +implementation = none +name = magnet1 +optype = magnetic_field +[I1] +datype = I +enabled = False +id = 1 +implementation = none +name = curr1 +optype = multimeter +[I2] +datype = I +enabled = False +id = 2 +implementation = none +name = curr2 +optype = multimeter +[T1] +enabled = False +id = 1 +implementation = none +name = tc1 +optype = temperature +[T2] +enabled = False +id = 2 +implementation = none +name = tc2 +optype = temperature +[T3] +enabled = False +id = 3 +implementation = none +name = tc3 +optype = temperature +[T4] +enabled = False +id = 4 +implementation = none +name = tc4 +optype = temperature +[T5] +enabled = False +id = 5 +implementation = none +name = tc5 +optype = temperature +[V1] +datype = V +enabled = False +id = 1 +implementation = none +name = volts1 +optype = multimeter +[V2] +datype = V +enabled = False +id = 2 +implementation = none +name = volts2 +optype = multimeter +[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 [12tmagnet_oxford] desc = "12 Tesla Oxford Magnet" @@ -21,21 +103,6 @@ port = 55001 desc = "Load the twenty position sample changer configuration" imptype = motion_axis -[20_position_setup] -cascade = T1:julabo_lh45,sample_stage:20_pos_sample_stage -enabled = False - -[B1] -enabled = False -id = 1 -implementation = none -name = magnet1 -optype = magnetic_field - -[CF1] -cascade = T1:CF1_ls340,sample_stage:normal_sample_stage -enabled = False - [CF1_ls340] desc = "cf1: Bottom loading cryofurnace" driver = "lakeshore_340" @@ -46,81 +113,10 @@ terminator = \r\n tol1 = 1.0 tol2 = 1.0 -[Default] -cascade = sample_stage:normal_sample_stage -enabled = True - -[I1] -datype = I -enabled = False -id = 1 -implementation = none -name = curr1 -optype = multimeter - -[I2] -datype = I -enabled = False -id = 2 -implementation = none -name = curr2 -optype = multimeter - [Oxford_12tmagnet_sample_insert] desc = "som will be redefined as the magnet sample insert rotation. Sample stage will be renamed to somss" imptype = motion_axis -[T1] -enabled = False -id = 1 -implementation = none -name = tc1 -optype = temperature - -[T2] -enabled = False -id = 2 -implementation = none -name = tc2 -optype = temperature - -[T3] -enabled = False -id = 3 -implementation = none -name = tc3 -optype = temperature - -[T4] -enabled = False -id = 4 -implementation = none -name = tc4 -optype = temperature - -[T5] -enabled = False -id = 5 -implementation = none -name = tc5 -optype = temperature - -[V1] -datype = V -enabled = False -id = 1 -implementation = none -name = volts1 -optype = multimeter - -[V2] -datype = V -enabled = False -id = 2 -implementation = none -name = volts2 -optype = multimeter - [bruker_bec1] desc = "Bruker Magnet" driver = "bruker_bec1" @@ -129,10 +125,6 @@ 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" @@ -264,16 +256,6 @@ 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 - [watlow_rm] desc = "Watlow RM temperature controller" driver = "watlow_rm"