linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/beamline/sct_he3_polanal.tcl
	sics/site_ansto/instrument/hipd/wombat_configuration.tcl
	sics/site_ansto/instrument/hrpd/echidna_configuration.tcl
	sics/site_ansto/instrument/pelican/pelican_configuration.tcl
This commit is contained in:
Douglas Clowes
2014-09-01 13:23:21 +10:00
parent 679838eac3 2b73a7eaca
commit c3bb4a9591
69 changed files with 3633 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
site_ansto/instrument/config/environment/agilent_33220A_sct.tcl
View File

@@ -100,6 +100,8 @@ proc ::scobj::agilent_33220A::read_config {} {
}
if { [string equal -nocase [dict get $v "driver"] "agilent_33220A"] } {
::scobj::agilent_33220A::sics_log 9 "No sctcontroller for agilent_33220A"
set ip_address [dict get $v ip]
set tcp_port [dict get $v port]
${ns}::mkDriver sct_${name} ${name} ${device_class} ${simulation_flag} ${ip_address} ${tcp_port}
}
}