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

Merge branch 'Taipan_R31' into temp

Browse Source 
Conflicts:
	sics/site_ansto/instrument/config/environment/temperature/sct_lakeshore_m370.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_west_6100.tcl
	sics/site_ansto/instrument/tas/config/motors/motor_configuration.tcl
	sics/site_ansto/instrument/tas/taipan_configuration.tcl
	sics/site_ansto/instrument/tas/util/sics_config.ini
This commit is contained in:
Douglas Clowes
2015-02-19 14:50:39 +11:00
parent 8c4eed9bfe 2dcf274618
commit 106d61a883
4 changed files with 188 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
site_ansto/instrument/config/counter/counter_common_1.tcl
View File

@@ -35,8 +35,8 @@ proc ::counter::ic_initialize {} {
# This must be sourced before the hmm_configuration.tcl until we separate the scan setup from the hmm setup
for {set i 0; set n 1} {$i < $isc_numchannels} {incr i; incr n} {
MakeCounter bm$n anstomonitor [ params host $isc_monitor_address port [lindex $isc_portlist $i] ]
bm$n send scan=1
bm$n send sample=10
bm$n send set scan=1
bm$n send set sample=10
append bm_list "bm$n "
}
}