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

improve coding for MA11 (codeb=0 Ohm)

Browse Source 
+ was_uplugged should be cleared in proc samenv
This commit is contained in:
l_samenv
2024-10-17 10:53:04 +02:00
parent 75ede2b0b3
commit bdd25b4ec7
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tcl/config/ccu4device.list
View File

@ -34,7 +34,7 @@ ORI6 0.1 fna 520 24
ORI7 56 fno 400 74 ORI7 56 fno 400 74
MA02 4.7 fnH MA02 4.7 fnH
MA09 5.6 fH MA09 5.6 fH
MA11 6.8 fNH MA11 6.8 0 fNH
MA15 8.2 fNH MA15 8.2 fNH
MA6 12 fNH MA6 12 fNH
MA7 15 fNH MA7 15 fNH

4
tcl/drivers/magfield.tcl
View File

@ -230,8 +230,8 @@ proc magfield::run {} {
set_time_if {$hs == 1} heater_on set_time_if {$hs == 1} heater_on
set_time_if {$hs == 0} heater_off set_time_if {$hs == 0} heater_off
set_time_if {abs($ls - $pf) < $tol} leads_at_field set_time_if {abs($ls - $pf) < $tol * 5} leads_at_field
set_time_if {abs($ls - $tf) < $tol} leads_at_target set_time_if {abs($ls - $tf) < $tol * 5} leads_at_target
if {$tf != [sct last_target]} { if {$tf != [sct last_target]} {
sct phase 1 ;# start a field change sct phase 1 ;# start a field change
sct last_target $tf sct last_target $tf

8
tcl/ma7.config
View File

@ -9,9 +9,11 @@ makenv tt -driver [lsdriver] {
lsc_sensor ts_2 D -sensor code -sensorname sample2 lsc_sensor ts_2 D -sensor code -sensorname sample2
# lsc_sensor ts_2 D -sensor x63881 -sensorname sample2 # lsc_sensor ts_2 D -sensor x63881 -sensorname sample2
lsc_loop set -loop 1 -channel A -maxheater 32W -resist 80Ohm -color green lsc_loop set -loop 1 -channel A -maxheater 32W -resist 80Ohm -color green
if {[lsdriver] eq "336_lsc"} { # if {[lsdriver] eq "336_lsc"} {
lsc_loop setsamp -loop 2 -channel C -maxheater 62.5W -resist 40Ohm -loopname sample -color dark_green # lsc_loop setsamp -loop 2 -channel C -maxheater 62.5W -resist 40Ohm -loopname sample -color dark_green
} # 2024 temporary mod for thermalcond stick on prep3
lsc_loop setsamp -loop 2 -channel C -maxheater 1W -resist 82Ohm -loopname sample -color dark_green
# }
} }
tt set/limit 310 tt set/limit 310

8
tcl/ma7_sampleheat.config
View File

@ -12,10 +12,12 @@ makenv tt -driver [lsdriver] {
lsc_loop setsamp -loop 2 -channel D -maxheater 10W -resist 10Ohm -loopname sample -color dark_green lsc_loop setsamp -loop 2 -channel D -maxheater 10W -resist 10Ohm -loopname sample -color dark_green
} }
} }
tt set/limit 310
tt setsamp/prop 5
tt setsamp/integ 200
if {[lsdriver] eq "336_lsc"} {
tt set/limit 310
tt setsamp/prop 5
tt setsamp/integ 200
}
makeCCU4 ma7 nv_release_blocked he_ilm makeCCU4 ma7 nv_release_blocked he_ilm
hupdate /nv/set 1.2 hupdate /nv/set 1.2

3
tcl/seacom.tcl
View File

@ -904,7 +904,7 @@ proc samenv args {
global inside_samenv unconfigured_list vars logbase global inside_samenv unconfigured_list vars logbase
global objects_created objects_replaced objects_already device_name global objects_created objects_replaced objects_already device_name
global selected_stick selected_addons global selected_stick selected_addons
global change_device_to_none global change_device_to_none was_unplugged
set inside_samenv 0 set inside_samenv 0
set verbose 1 set verbose 1
@ -965,6 +965,7 @@ proc samenv args {
} }
set change_device_to_none 0 set change_device_to_none 0
set was_unplugged 0
set nl [split $name /] set nl [split $name /]
if {[llength $nl] == 1} { if {[llength $nl] == 1} {

2
tcl/thermalcond.stick
View File

@ -9,12 +9,14 @@ makenv res -driver 370_lsc {
lsc_sensor s2 -channel 2 -sensor x200044 -excitation 200uV lsc_sensor s2 -channel 2 -sensor x200044 -excitation 200uV
lsc_sensor s3 -channel 3 -sensor x200038 -excitation 200uV lsc_sensor s3 -channel 3 -sensor x200038 -excitation 200uV
lsc_sensor s4 -channel 4 -sensor x200048 -excitation 200uV lsc_sensor s4 -channel 4 -sensor x200048 -excitation 200uV
lsc_sensor s5 -channel 5 -sensor x200047 -excitation 200uV
} }
GraphAdd res.s1 K R1 GraphAdd res.s1 K R1
GraphAdd res.s2 K R2 GraphAdd res.s2 K R2
GraphAdd res.s3 K R3 GraphAdd res.s3 K R3
GraphAdd res.s4 K R4 GraphAdd res.s4 K R4
GraphAdd res.s5 K R5
res autoscan/interval 15 res autoscan/interval 15
res autoscan/pause 5 res autoscan/pause 5