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

hmm_configuration_common_1.tcl

Browse Source 
The post_count callback should be called when the count ends.

quokka_configuration.tcl
Added lakeshore 336, qlink, and rheometer configurations.

quokka sct_flipper.tcl
Report "-1" for fields which return corrupt or invalid readings.

quokka environment.tcl
Implement histogram memory pre_count and post_count callbacks to record temperature before and after an acquisition.

quokka motor_configuration.tcl
Set correct max speed for detector motor, ie it is now 53mm/s instead of 40

wombat_configuration.tcl
Added lakeshore 336 driver and julabo and qlink.
r3034 | ffr | 2010-12-03 11:07:49 +1100 (Fri, 03 Dec 2010) | 17 lines
This commit is contained in:
Ferdi Franceschini
2010-12-03 11:07:49 +11:00
committed by Douglas Clowes
parent e7e857b70e
commit 8d066dec11
8 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
site_ansto/instrument/config/hmm/hmm_configuration_common_1.tcl
View File

@@ -1146,6 +1146,9 @@ proc SAT_TABLE {args} {
} }
} }
proc ::histogram_memory::pre_count {} {}
proc ::histogram_memory::post_count {} {}
## ##
# @brief Resolve dependencies between the histogram memory tables # @brief Resolve dependencies between the histogram memory tables
proc ::histogram_memory::synch_tables {} { proc ::histogram_memory::synch_tables {} {
@@ -1445,6 +1448,7 @@ sicslist setatt ::histogram_memory::ratemap_xy_total mutable true
## ##
# @brief Update the beam monitors when the histmem has finished counting. # @brief Update the beam monitors when the histmem has finished counting.
proc ::histogram_memory::countend_event {} { proc ::histogram_memory::countend_event {} {
::histogram_memory::post_count
::histogram::histmem_cmd -set feedback status IDLE ::histogram::histmem_cmd -set feedback status IDLE
bm status bm status
} }
@@ -1526,8 +1530,6 @@ Publish FAT_TABLE user
Publish OAT_TABLE user Publish OAT_TABLE user
Publish SAT_TABLE user Publish SAT_TABLE user
proc ::histogram_memory::pre_count {} {}
proc ::histogram_memory::post_count {} {}
## ##
# @brief Start an acquisition, non-blocking by default # @brief Start an acquisition, non-blocking by default

32
site_ansto/instrument/hipd/wombat_configuration.tcl
View File

@@ -25,8 +25,10 @@ fileeval $cfPath(motors)/positmotor_configuration.tcl
fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(counter)/counter.tcl
#TODO Provide method for choosing environment controller #TODO Provide method for choosing environment controller
fileeval $cfPath(environment)/temperature/lakeshore340.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_3xx.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl
fileeval $cfPath(environment)/temperature/sct_qlink.tcl
fileeval $cfPath(environment)/temperature/west400.tcl fileeval $cfPath(environment)/temperature/west400.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(nexus)/nxscripts.tcl
@@ -39,23 +41,21 @@ fileeval $cfPath(hmm)/hmm_rapid.tcl
source gumxml.tcl source gumxml.tcl
# Drivers for Lakeshore Temperature Controller ##########################################################
# old Lakeshore driver (c-code) # Current driver for Lakeshore temperature controllers #
# ::environment::temperature::add_ls340 tc1 137.157.201.86 1 ##########################################################
# ::environment::temperature::add_ls340 tc2 137.157.201.86 2 # driverName shortName IP-address port LineTerminator Tolerance1 Tolerance2 optional_Verbose
add_sct_ls340 tc1 137.157.201.86 4001 "\r" 5.0 5.0
# add_sct_ls336 tc1 137.157.201.85 7777 "\r\n" 5.0 5.0
# New Lakeshore series driver for models 340 and 336 - (tcl-code, version 20090824) - beta status # add_sct_ls336 tc1 137.157.201.86 7777 "\r\n" 5.0 5.0
# driverName shortName IP-address portOnMoxa temperatureTolerance1 Tolerance2 LakeshoreModel
# ffr 2009-11-11: NOTE I've added a line terminator argument to the ls3xx setup.
# You need to set the line termintator to either "\r\n" for CRLF or "\r" for CR
# name IP-address port term LakeshoreModel tol1 tol2
# add_ls3xx tc1 137.157.201.85 7777 "\r\n" 336 5 5
# add_ls3xx tc1 137.157.201.86 4001 "\r\" 400 340 # The Alice Thing
# add_ls3xx tc2 137.157.201.86 4002 "\r" 5 5 340 # add_qlink qlink 137.157.201.86 4004 5
# add_sct_ls340 tc1 137.157.201.86 4002 "\r" 5.0 5.0
# add_lh45 tc2 137.157.201.86 4003 1
# ::environment::temperature::add_west400 137.157.201.88
#::environment::temperature::add_west400 137.157.201.88
server_init server_init
########################################### ###########################################
# WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly. # WARNING: Do not add any code below server_init, if you do SICS may fail to initialise properly.

2
site_ansto/instrument/rsd/config/INSTCFCOMMON.TXT
View File

@@ -6,6 +6,8 @@ config/environment/temperature/sct_lakeshore_336.tcl
config/environment/temperature/sct_lakeshore_340.tcl config/environment/temperature/sct_lakeshore_340.tcl
config/environment/temperature/sct_eurotherm_2000.tcl config/environment/temperature/sct_eurotherm_2000.tcl
config/environment/sct_protek_common.tcl config/environment/sct_protek_common.tcl
config/environment/temperature/sct_oxford_itc.tcl
config/environment/temperature/sct_oxford_ips.tcl
config/hipadaba/hipadaba_configuration_common.tcl config/hipadaba/hipadaba_configuration_common.tcl
config/hipadaba/common_instrument_dictionary.tcl config/hipadaba/common_instrument_dictionary.tcl
config/hipadaba/instdict_specification.tcl config/hipadaba/instdict_specification.tcl

2
site_ansto/instrument/rsd/kowari_configuration.tcl
View File

@@ -26,6 +26,8 @@ fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl fileeval $cfPath(environment)/temperature/sct_eurotherm_2000.tcl
fileeval $cfPath(environment)/sct_protek_common.tcl fileeval $cfPath(environment)/sct_protek_common.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_itc.tcl
fileeval $cfPath(environment)/temperature/sct_oxford_ips.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(scan)/scan.tcl fileeval $cfPath(scan)/scan.tcl

13
site_ansto/instrument/sans/config/beamline/sct_flipper.tcl
View File

@@ -50,6 +50,7 @@ namespace eval ::scobj::rfgen {
proc ::scobj::rfgen::mkStatArr {stateArrName stateReport} { proc ::scobj::rfgen::mkStatArr {stateArrName stateReport} {
upvar $stateArrName stateArr upvar $stateArrName stateArr
array set stateArr $stateReport array set stateArr $stateReport
if {$stateArr(curr) != 0} { if {$stateArr(curr) != 0} {
set val [string trimleft $stateArr(curr) 0] set val [string trimleft $stateArr(curr) 0]
if {[string is integer $val]} { if {[string is integer $val]} {
@@ -170,6 +171,18 @@ proc ::scobj::rfgen::rdStatFunc {} {
return stateChange return stateChange
} }
set statList [split $statStr "|="] set statList [split $statStr "|="]
foreach {k v} $statList {
if {$k == "type"} {
lappend temp "$k $v"
continue
}
if {[string is integer $v]} {
lappend temp "$k $v"
} else {
lappend temp "$k -1"
}
}
set statList [join $temp]
mkStatArr stateArr $statList mkStatArr stateArr $statList
if {$statList != [sct oldStateRep]} { if {$statList != [sct oldStateRep]} {

15
site_ansto/instrument/sans/config/environment/environment.tcl
View File

@@ -4,15 +4,24 @@ puts "selecting $envtemp for environment control"
switch $envtemp { switch $envtemp {
"lh45" { "lh45" {
add_lh45 tc1 ca5-quokka 4003 1 add_lh45 tc1 ca5-quokka 4003 1
proc ::histogram_memory::pre_count {} {
hset /sample/tc1/sensor/start_temperature [hval /sample/tc1/sensor/value]
hset /sample/tc1/sensor/end_temperature [hval /sample/tc1/sensor/value]
}
proc ::histogram_memory::post_count {} {
hset /sample/tc1/sensor/end_temperature [hval /sample/tc1/sensor/value]
}
} }
"rhqc" { "rhqc" {
puts "Configuring RHQC" puts "Configuring RHQC"
# 9600 8 1 None None Enable
add_sct_ls340 tc1 ca5-[instname] 4001 "\r" 0.5 5.0 add_sct_ls340 tc1 ca5-[instname] 4001 "\r" 0.5 5.0
# TODO Set controlsensor # TODO Set controlsensor
# if { [SplitReply [environment_simulation]] == "false"} { # if { [SplitReply [environment_simulation]] == "false"} {
# tc1 controlsensor sensorB # tc1 controlsensor sensorB
# } # }
# puts "Added tc1 with [tc1 controlsensor]" # puts "Added tc1 with [tc1 controlsensor]"
# 9600 8 1 None None Enable
add_sct_ls340 tc2 ca5-[instname] 4002 "\r" 0.5 5.0 add_sct_ls340 tc2 ca5-[instname] 4002 "\r" 0.5 5.0
# TODO Set controlsensor # TODO Set controlsensor
# if { [SplitReply [environment_simulation]] == "false"} { # if { [SplitReply [environment_simulation]] == "false"} {
@@ -22,17 +31,17 @@ switch $envtemp {
} }
"11TMagnet" { "11TMagnet" {
puts "Configuring 11TMagnet" puts "Configuring 11TMagnet"
add_sct_ls340 tc1 ca5-[instname] 4001 "\r" 0.5 5.0 add_sct_ls340 tc2 ca5-[instname] 4001 "\r" 0.5 5.0
if { [SplitReply [environment_simulation]] == "false"} { if { [SplitReply [environment_simulation]] == "false"} {
::utility::macro::getset float temperature {} { ::utility::macro::getset float temperature {} {
return [sicsmsgfmt [hval /sample/tc1/sensor/sensorValueA]] return [sicsmsgfmt [hval /sample/tc2/sensor/sensorValueA]]
} }
sicslist setatt temperature long_name temperature sicslist setatt temperature long_name temperature
sicslist setatt temperature klass sample sicslist setatt temperature klass sample
sicslist setatt temperature units K sicslist setatt temperature units K
# TODO Set controlsensor # TODO Set controlsensor
# tc1 controlsensor sensorA # tc1 controlsensor sensorA
} # }
add_ips120 ips120 ca5-quokka 4004 0.001 add_ips120 ips120 ca5-quokka 4004 0.001
} }

4
site_ansto/instrument/sans/config/motors/motor_configuration.tcl
View File

@@ -331,7 +331,7 @@ Motor det $motor_driver_type [params \
units mm\ units mm\
hardlowerlim 488\ hardlowerlim 488\
hardupperlim 19320\ hardupperlim 19320\
maxSpeed 40\ maxSpeed 53\
maxAccel 5\ maxAccel 5\
maxDecel 10\ maxDecel 10\
stepsPerX $det_StepsPerX\ stepsPerX $det_StepsPerX\
@@ -344,7 +344,7 @@ det precision 1
det softlowerlim 500 det softlowerlim 500
det softupperlim 19310 det softupperlim 19310
det home 350.5 det home 350.5
det speed 40 det speed 53
det Blockage_Fail 0 det Blockage_Fail 0
# Detector translation across beam [-50,450] mm # Detector translation across beam [-50,450] mm

8
site_ansto/instrument/sans/quokka_configuration.tcl
View File

@@ -25,8 +25,8 @@ fileeval $cfPath(parameters)/parameters.tcl
fileeval $cfPath(plc)/plc.tcl fileeval $cfPath(plc)/plc.tcl
fileeval $cfPath(optics)/optics.tcl fileeval $cfPath(optics)/optics.tcl
fileeval $cfPath(counter)/counter.tcl fileeval $cfPath(counter)/counter.tcl
fileeval $cfPath(environment)/temperature/lakeshore340.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl
fileeval $cfPath(environment)/temperature/sct_lakeshore_3xx.tcl fileeval $cfPath(environment)/temperature/sct_lakeshore_336.tcl
fileeval $cfPath(hmm)/hmm_configuration.tcl fileeval $cfPath(hmm)/hmm_configuration.tcl
fileeval $cfPath(nexus)/nxscripts.tcl fileeval $cfPath(nexus)/nxscripts.tcl
fileeval $cfPath(hmm)/detector.tcl fileeval $cfPath(hmm)/detector.tcl
@@ -34,10 +34,12 @@ fileeval $cfPath(scan)/scan.tcl
fileeval $cfPath(commands)/commands.tcl fileeval $cfPath(commands)/commands.tcl
fileeval $cfPath(anticollider)/anticollider.tcl fileeval $cfPath(anticollider)/anticollider.tcl
fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl fileeval $cfPath(environment)/temperature/sct_julabo_lh45.tcl
fileeval $cfPath(environment)/temperature/sct_qlink.tcl
fileeval $cfPath(environment)/magneticField/sct_oxford_ips.tcl fileeval $cfPath(environment)/magneticField/sct_oxford_ips.tcl
fileeval $cfPath(environment)/environment.tcl fileeval $cfPath(environment)/environment.tcl
fileeval $cfPath(environment)/sct_mcr500_rheometer.tcl
fileeval $cfPath(environment)/sct_protek_common.tcl
fileeval $cfPath(beamline)/spin_flipper.tcl fileeval $cfPath(beamline)/spin_flipper.tcl
fileeval $cfPath(goniometer)/spin_goniometer.tcl
source gumxml.tcl source gumxml.tcl
::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false ::utility::mkVar ::anticollider::protect_detector text manager protect_detector false detector true false