Merge branch 'master' of gitlab.psi.ch-samenv:samenv/sea

Conflicts:
	tcl/drivers/hepump.tcl

tcl/drivers/lsc.tcl

@@ -895,7 +895,7 @@ proc lsc::set_curve {} {
 }
 
 #write action, direct
-proc lsc::check_header {id} {
+proc lsc::check_header {{id unknown}} {
   upvar #0 lsc::cache_$id cache
   if {[lsc::hdreq $cache([sct curveno]) [sct result]]} {
     sct oldhdr [sct result]
@@ -4628,6 +4628,7 @@ proc stdConfig::lsc_end {} {
   if {$lsc(samplesensor) eq ""} {
     set lsc(samplesensor) $lsc(mainsensor)
   }
+  dolater 0 fix_stick_sensors
   hsetprop $path getcmd "hvali $path/$lsc(mainsensor)"
   hsetprop $path getsample "hvali $path/$lsc(samplesensor)"
   if {[silent "" set lsc(setsample)] ne ""} {