Merge branch 'RELEASE-3_1'

Conflicts: sics/site_ansto/instrument/config/environment/hiden_xcs_sct.tcl sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl sics/site_ansto/instrument/hipd/wombat_configuration.tcl sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl sics/site_ansto/instrument/pelican/pelican_configuration.tcl sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl sics/site_ansto/instrument/util/gen_sct.py
2014-11-06 14:13:20 +11:00
parent 2076c0a5fc 8a61f65701
commit 3ce5ae0977
52 changed files with 4133 additions and 3116 deletions
--- a/site_ansto/instrument/reflectometer/config/beamline/sct_RFGen.tcl
+++ b/site_ansto/instrument/reflectometer/config/beamline/sct_RFGen.tcl
@@ -146,6 +146,9 @@ proc ::scobj::rfgen::set_frequency {basePath} {
 ##
 # @brief Request a state report from the RF generator
 proc ::scobj::rfgen::rqStatFunc {} {
+  if { [hpropexists [sct] geterror] } {
+    hdelprop [sct] geterror
+  }
  sct send "L:[sct address]"
  return rdState
 }
@@ -167,7 +170,6 @@ proc ::scobj::rfgen::rdStatFunc {} {
  set statStr [sct result]
  if {[string match "ASCERR:*" $statStr]} {
    sct geterror $statStr
-    sct ramping $RAMPIDLE
    return stateChange
  }
  set statList [split $statStr "|="]
@@ -402,6 +404,8 @@ proc ::scobj::rfgen::mkRFGen {argList} {
  if {[SplitReply [rfgen_simulation]] == "false"} {
  set SCT_RFGEN sct_rfgen_$pa(NAME)
  makesctcontroller $SCT_RFGEN rfamp $pa(IP):$pa(PORT)
+  # The RFGen has been observed to fail to respond within the default timeout of 2 sec 
+  $SCT_RFGEN timeout 5
  hsetprop /sics/$pa(NAME) contname $SCT_RFGEN
 # mkStatArr stateArr [split [$SCT_RFGEN transact "L:$pa(ADDRESS)"] "|="]

--- a/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
+++ b/site_ansto/instrument/reflectometer/config/motors/motor_configuration.tcl
@@ -98,7 +98,7 @@ set ss4d_home_mm 0.0
 set ss4l_home_mm 0.0
 set ss4r_home_mm 0.0

-Default upper and lower ranges for vertical slits
+#Default upper and lower ranges for vertical slits
 set vSlitHome 0
 set vSlitLoRange 5
 set vSlitHiRange 25
--- a/site_ansto/instrument/reflectometer/platypus_configuration.tcl
+++ b/site_ansto/instrument/reflectometer/platypus_configuration.tcl
@@ -26,13 +26,20 @@ fileeval $cfPath(parameters)/parameters.tcl
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(counter)/counter.tcl
 fileeval $cfPath(environment)/sct_syr.tcl
+fileeval $cfPath(environment)/sct_syringe_pump.tcl
+fileeval $cfPath(environment)/sct_knauer_pump.tcl
 fileeval $cfPath(environment)/sct_mvp.tcl
+fileeval $cfPath(environment)/sct_mvp_valve.tcl
 fileeval $cfPath(environment)/sct_protek_common.tcl
+fileeval $cfPath(environment)/protekmm_sct.tcl
 fileeval $cfPath(environment)/omron_hldc_sct.tcl
 fileeval $cfPath(environment)/magneticField/sct_bruker_BEC1.tcl
+fileeval $cfPath(environment)/magneticField/sct_bruker.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
+fileeval $cfPath(environment)/temperature/sct_ls336.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
-fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl
+fileeval $cfPath(environment)/temperature/sct_ls340.tcl
+fileeval $cfPath(environment)/temperature/sct_julabo_lh45_gen.tcl
 fileeval $cfPath(hmm)/hmm_configuration.tcl
 fileeval $cfPath(nexus)/nxscripts.tcl
 fileeval $cfPath(hmm)/detector.tcl
--- a/site_ansto/instrument/reflectometer/util/sics_config.ini
+++ b/site_ansto/instrument/reflectometer/util/sics_config.ini
@@ -0,0 +1,304 @@
+[Bruker_CF6]
+cascade = T1:CF6_ls340,B1:bruker_bec1,sample_stage:normal_sample_stage
+enabled = False
+[Default]
+cascade = sample_stage:normal_sample_stage
+enabled = True
+[Knauer and Syringe]
+cascade = HPLC:knauer_01,Syringe:syringe,sample_stage:normal_sample_stage
+enabled = False
+[Knauer, Syringe and MVP]
+cascade = HPLC:knauer_01,Syringe:syringe,MVP:mvp,sample_stage:normal_sample_stage
+enabled = False
+[B1]
+datype = B
+enabled = False
+id = 1
+implementation = none
+name = ma1
+optype = magnetic_field
+[Function_Generator]
+datype = V
+enabled = False
+id = 1
+implementation = none
+name = pulser
+optype = function_generator
+[HPLC]
+datype = pump
+enabled = False
+id = 1
+implementation = none
+name = hplc
+optype = hplc
+[High_Voltage]
+datype = V
+enabled = False
+id = 1
+implementation = none
+name = hv_val
+optype = multimeter
+[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
+[MVP]
+datype = valve
+enabled = False
+id = 1
+implementation = none
+name = mvp
+optype = valve
+[Power Supply]
+datype = V
+enabled = False
+id = 1
+implementation = none
+name = power_supply
+optype = power_supply
+[Syringe]
+datype = pump
+enabled = False
+id = 1
+implementation = none
+name = syr
+optype = syringe
+[T1]
+datype = T
+enabled = False
+id = 1
+implementation = none
+name = tc1
+optype = temperature
+[T2]
+datype = T
+enabled = False
+id = 2
+implementation = none
+name = tc2
+optype = temperature
+[T3]
+datype = T
+enabled = False
+id = 3
+implementation = none
+name = tc3
+optype = temperature
+[T4]
+datype = T
+enabled = False
+id = 4
+implementation = none
+name = tc4
+optype = temperature
+[T5]
+datype = T
+enabled = False
+id = 5
+implementation = none
+name = tc5
+optype = temperature
+[T6]
+datype = T
+enabled = False
+id = 6
+implementation = none
+name = tc6
+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
+[5Tmagnet]
+desc = "The New Zealand magnet"
+driver = tsi_smc
+imptype = magnetic_field
+ip = 137.157.202.151
+port = 4004
+timeout = 2000
+
+[CF6_ls340]
+desc = "cf6: Bottom loading cryocooler"
+driver = "ls340"
+imptype = temperature
+ip = 10.157.205.38
+port = 4001
+terminator = \r\n
+tol1 = 0.2
+tol2 = 0.2
+
+[agilent_33220A]
+asyncqueue = sct
+desc = "Function Generator"
+driver = agilent_33220A
+imptype = function_generator
+ip = 10.157.205.16
+port = 5025
+
+[bruker_bec1]
+desc = "Bruker Magnet"
+driver = "bruker"
+imptype = magnetic_field
+ip = 10.157.205.13
+port = 4444
+tol = 0.1
+
+[hiden_xcs]
+desc = "Hiden XCS Relative Humidity Flow Control"
+driver = "hiden_xcs"
+imptype = flowcontrol
+ip = 137.157.202.151
+port = 4001
+
+[isotech_ps]
+desc = "Isotech Power Supply:Baud=2400,Data=8,Stop=1,Parity=None,Flow=None"
+driver = "isotech_ps"
+imptype = power_supply
+ip = 137.157.202.151
+port = 4001
+
+[knauer_01]
+asyncprotocol = knauer_ap
+desc = "Knauer BlueShadow Pump 40P (High Performance/Pressure Liquid Chromatography)"
+driver = knauer_pump
+imptype = hplc
+ip = 10.157.205.51
+port = 10001
+timeout = 1000
+
+[ls336_01]
+asyncqueue = sct
+desc = "Lakeshore 336 temperature controller"
+driver = "ls336"
+imptype = temperature
+ip = 10.157.205.28
+port = 7777
+terminator = \r\n
+tol1 = 1.0
+tol2 = 1.0
+
+[ls336_02]
+asyncqueue = sct
+desc = "Lakeshore 336 temperature controller"
+driver = "ls336"
+imptype = temperature
+ip = 10.157.205.29
+port = 7777
+terminator = \r\n
+tol1 = 1.0
+tol2 = 1.0
+
+[ls336_04]
+asyncqueue = sct
+desc = "Lakeshore 336 temperature controller"
+driver = "ls336"
+imptype = temperature
+ip = 10.157.205.30
+port = 7777
+terminator = \r\n
+tol1 = 1.0
+tol2 = 1.0
+
+[ls336_12]
+asyncqueue = sct
+desc = "Lakeshore 336 temperature controller"
+driver = "ls336"
+imptype = temperature
+ip = 10.157.205.31
+port = 7777
+terminator = \r\n
+tol1 = 1.0
+tol2 = 1.0
+
+[mercury_scpi_01]
+desc = "Oxford Mercury temperature controller in Mercury mode"
+driver = "mercury_scpi"
+imptype = temperature
+ip = 10.157.205.5
+permlink = LT
+port = 7020
+terminator = \r\n
+tol = 1.0
+valve_tol = 2
+
+[mercury_scpi_02]
+desc = "Oxford Mercury temperature controller in Mercury mode"
+driver = "mercury_scpi"
+imptype = temperature
+ip = 10.157.205.47
+permlink = LT
+port = 7020
+terminator = \r\n
+tol = 1.0
+valve_tol = 2
+
+[mvp]
+desc = "Valve controller"
+driver = mvp_valve
+imptype = valve
+ip = 137.157.202.151
+port = 4004
+
+[normal_sample_stage]
+desc = "This is the default sample stage configuration xyz translation omega rotation but no tilt axes"
+imptype = motion_axis
+
+[platypus_julabo]
+ctrl_sensor = "bath"
+desc = "Julabo temperature controller"
+driver = "julabo_lh45"
+imptype = temperature
+ip = 137.157.202.151
+port = 4002
+tol = 2.0
+type = T
+
+[protek_01]
+asyncqueue = sct
+desc = "Protek Multimeter"
+driver = "protekmm"
+imptype = multimeter
+ip = 10.157.205.36
+port = 4001
+
+[protek_02]
+asyncqueue = sct
+desc = "Protek Multimeter"
+driver = "protekmm"
+imptype = multimeter
+ip = 10.157.205.37
+port = 4001
+
+[syringe]
+desc = "Syringe Pump"
+driver = syringe_pump
+imptype = syringe
+ip = 137.157.202.151
+port = 4003
+timeout = 1000
+