Quokka environment.tcl
Don't make the temperature getset-macro or select the control sensor for the script validator instance of SICS. (fixed in-situ) Use new ls340 and ls336 controllers. script_context_util.tcl Modified hinitprops so that it can take sub-paths nxscripts_common_1.tcl Added ::nexus::OnFirstsave ::nexus:OnLastSave to register commands which will be executed on the first and last save of a data file. sct_julabo_lh45.tcl Added start_temperature and end_temperature parameters to record the initial and final temperature readings in the data files. Also only set the setpoint if the Julabo is in remote mode. sct_positmotor_common.tcl Report 99999 if a posit motor table is out of range. quokka guide_configuration.tcl Updated aperture size for p1, p1lp, p1lens in the guide configuration table. r2969 | ffr | 2010-07-01 22:09:09 +1000 (Thu, 01 Jul 2010) | 20 lines
This commit is contained in:
committed by
Douglas Clowes
parent
d94cf7b011
commit
bbc133dab9
@@ -7,27 +7,34 @@ switch $envtemp {
|
||||
}
|
||||
"rhqc" {
|
||||
puts "Configuring RHQC"
|
||||
::environment::temperature::add_ls340 tc1 137.157.202.85 1
|
||||
tc1 controlsensor sensorB
|
||||
add_sct_ls340 tc1 ca5-[instname] 4001 "\r" 0.5 5.0
|
||||
|
||||
if { [SplitReply [environment_simulation]] == "false"} {
|
||||
tc1 controlsensor sensorB
|
||||
}
|
||||
puts "Added tc1 with [tc1 controlsensor]"
|
||||
::environment::temperature::add_ls340 tc2 137.157.202.85 2
|
||||
tc2 controlsensor sensorD
|
||||
add_sct_ls340 tc2 ca5-[instname] 4002 "\r" 0.5 5.0
|
||||
if { [SplitReply [environment_simulation]] == "false"} {
|
||||
tc2 controlsensor sensorD
|
||||
}
|
||||
puts "Added tc2 with [tc2 controlsensor]"
|
||||
}
|
||||
"11TMagnet" {
|
||||
puts "Configuring 11TMagnet"
|
||||
::environment::temperature::add_ls340 tc1 137.157.202.85 1
|
||||
::utility::macro::getset float temperature {} {
|
||||
return [sicsmsgfmt [hval /sample/tc1_cntrl/sensora/value]]
|
||||
add_sct_ls340 tc1 ca5-[instname] 4001 "\r" 0.5 5.0
|
||||
if { [SplitReply [environment_simulation]] == "false"} {
|
||||
::utility::macro::getset float temperature {} {
|
||||
return [sicsmsgfmt [hval /sample/tc1_cntrl/sensora/value]]
|
||||
}
|
||||
sicslist setatt temperature long_name temperature
|
||||
sicslist setatt temperature klass sample
|
||||
sicslist setatt temperature units K
|
||||
tc1 controlsensor sensorA
|
||||
}
|
||||
sicslist setatt temperature long_name temperature
|
||||
sicslist setatt temperature klass sample
|
||||
sicslist setatt temperature units K
|
||||
tc1 controlsensor sensorA
|
||||
|
||||
}
|
||||
default {
|
||||
clientput "No temperature controller configured"
|
||||
clientput "Unknown environment controller $envtemp"
|
||||
}
|
||||
}
|
||||
} msg ] {
|
||||
|
||||
@@ -30,9 +30,9 @@ array set guide_configuration {
|
||||
mt {{MT MT MT MT MT MT MT MT MT} 675}
|
||||
lp {{MT MT MT MT MT MT MT MT LP} 675}
|
||||
lens {{MT MT MT MT MT MT MT MT L } 675}
|
||||
p1 {{P A MT MT MT MT MT MT MT} 675}
|
||||
p1lp {{P A MT MT MT MT MT MT LP} 675}
|
||||
p1lens {{P A MT MT MT MT MT MT L } 675}
|
||||
p1 {{P A MT MT MT MT MT MT MT} 4621}
|
||||
p1lp {{P A MT MT MT MT MT MT LP} 4621}
|
||||
p1lens {{P A MT MT MT MT MT MT L } 4621}
|
||||
g1 {{G A A A A A A A A } 4929}
|
||||
p2 {{P G A A A A A A A } 6934}
|
||||
g2 {{G G A A A A A A A } 6934}
|
||||
|
||||
Reference in New Issue
Block a user