- A few fixes to the hsitogram memory codes

- Many fixes for the triple axis code
This commit is contained in:
cvs
2003-04-10 11:41:22 +00:00
parent bfb09e4593
commit cb4bbbc93c
35 changed files with 482 additions and 171 deletions

View File

@@ -27,9 +27,9 @@ if { [info exists tasinit] == 0 } {
Publish pr Spy
Publish se User
Publish lz Spy
Publish ll Spy
Publish lm Spy
Publish ls Spy
SicsAlias lz ll Spy
Publish le Spy
Publish lt Spy
Publish li Spy
@@ -45,7 +45,7 @@ if { [info exists tasinit] == 0 } {
# a list of motors, needed at various stages in this
set tasmot { a1 a2 a3 a4 a5 a6 mcv sro ach mtl mtu stl stu atu mgl sgl \
sgu agl}
sgu agl atl}
#-------------------------------------------------------------------------
# some MAD variables can be directly mapped to internal SICS variables.
# Some others require special functions to be called for them to be set.
@@ -88,6 +88,9 @@ proc circlify {val} {
while {$p > 360.0} {
set p [expr $p - 360.]
}
while {$p < -360.0} {
set p [expr $p + 360.]
}
return $p
}
#-------------------------------------------------------------------------
@@ -199,11 +202,13 @@ proc scatSense {par {val -1000} } {
set newupper [expr $oldupper - 90.]
} elseif { $val == 1 && $oldsa == -1} {
set newzero [expr $oldzero + 180. ]
set newlower [expr -($oldlower - 180.) ]
set newlower [expr $oldlower + 180 ]
set newupper [expr $oldupper + 180. ]
set newlower [circlify $newlower]
set newupper [circlify $newupper]
} elseif {$val == -1 && $oldsa == 1} {
set newzero [expr $oldzero - 180. ]
set newlower [expr -($oldlower - 180.) ]
set newlower [expr $oldlower - 180. ]
set newupper [expr $oldupper - 180. ]
} else {
error "Unknown SA setting combination"
@@ -640,7 +645,11 @@ proc se args {
}
#---------------------------------------------------------------------------
# lz list limits and zeros
# lz list limits and zeros, ll is the same
proc ll args {
return lz $args
}
proc lz args {
global tasmap
@@ -1016,6 +1025,12 @@ proc polsw args {
}
off {
lpa 0
set ret [catch {run i1 0} msg]
set ret [catch {run i2 0} msg]
set ret [catch {run i3 0} msg]
set ret [catch {run i4 0} msg]
set ret [catch {run i5 0} msg]
set ret [catch {run i6 0} msg]
return "Polarisation mode disabled"
}
flip {