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

Conflicts:
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/kookaburra/kookaburra_configuration.tcl
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
	sics/site_ansto/instrument/sans/config/environment/sct_antonparr_MCR500.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl

site_ansto/instrument/reflectometer/MANIFEST.TXT

@@ -2,7 +2,6 @@ runsics_def.py
 platypus_configuration.tcl
 sics_ports.tcl
 script_validator_ports.tcl
-extraconfig.tcl
 config
 util
 hostport_config.tcl

site_ansto/instrument/reflectometer/config/hmm/detector.tcl

@@ -14,10 +14,14 @@ evfactory new dhv1 nhq200 acq 1
 dhv1 tolerance 5
 dhv1 rate 25
 dhv1 upper 3000
+dhv1 max 3000
+dhv1 upperlimit 3000
 #dhv1 lock
 evfactory new dhv2 nhq200 acq 2
 dhv2 tolerance 5
 dhv2 rate 25
 dhv2 upper 1500
+dhv1 max 1500
+dhv1 upperlimit 1500
 #dhv2 lock
 }

site_ansto/instrument/reflectometer/platypus_configuration.tcl

@@ -33,6 +33,7 @@ fileeval $cfPath(environment)/mvp_valve_sct.tcl
 fileeval $cfPath(environment)/sct_protek_common.tcl
 fileeval $cfPath(environment)/protekmm_sct.tcl
 fileeval $cfPath(environment)/omron_hldc_sct.tcl
+fileeval $cfPath(environment)/keysight_N8740A_sct.tcl
 fileeval $cfPath(environment)/magneticField/sct_bruker_BEC1.tcl
 fileeval $cfPath(environment)/magneticField/bruker_sct.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
@@ -48,6 +49,7 @@ fileeval $cfPath(chopper)/chopper.tcl
 fileeval $cfPath(commands)/commands.tcl
 fileeval $cfPath(anticollider)/anticollider.tcl
 fileeval $cfPath(beamline)/polanal.tcl
+fileeval $cfPath(beamline)/he3_polanal_sct.tcl
 fileeval $cfPath(commands)/pulser.tcl
 fileeval $cfPath(commands)/hvcommands.tcl
 

site_ansto/instrument/reflectometer/sics_simulation.tcl

@@ -4,7 +4,7 @@
 # icsval column = settings when running on the Instrument Control Server (ie SICS_SIMULATION not defined)
 # fakedev column = settings for test platforms (ie SICS_SIMULATION=fakedev)
 foreach {simflag         icsval    fakedev} {
-  opal_simulation        true      true
+  opal_simulation        false      true
   detector_simulation    false     true
   hmm_simulation         false     true
   environment_simulation false     true