- A few fixes to the hsitogram memory codes
- Many fixes for the triple axis code
This commit is contained in:
@@ -549,7 +549,8 @@ proc count { {mode NULL } { preset NULL } } {
|
||||
if { [string compare $m null] == 0} {
|
||||
return
|
||||
} else {
|
||||
if { [syntaxCounterMode $m] != 1 } {
|
||||
set c [string index $mode 0]
|
||||
if { [regexp \[mc\] $c] != 1 } {
|
||||
error "ERROR: invalid counter mode $m specified for count"
|
||||
}
|
||||
}
|
||||
@@ -579,7 +580,8 @@ proc repeat { num {mode NULL} {preset NULL} } {
|
||||
if { [string compare $m null] == 0} {
|
||||
return
|
||||
} else {
|
||||
if { [syntaxCounterMode $m] != 1 } {
|
||||
set c [string index $mode 0]
|
||||
if { [regexp \[mc\] $c] != 1 } {
|
||||
error "ERROR: invalid counter mode $m specified for count"
|
||||
}
|
||||
}
|
||||
@@ -1036,6 +1038,41 @@ proc syntaxHKL {name args} {
|
||||
}
|
||||
}
|
||||
#---------------------------------------------------------------------------
|
||||
# syntax for xytables as used at SANS
|
||||
#---------------------------------------------------------------------------
|
||||
proc syntaxXY {name args} {
|
||||
set args [syntaxListify $args]
|
||||
if { [llength $args] < 1} {
|
||||
error "ERROR: expected argument to $name"
|
||||
}
|
||||
set subcommand [string tolower [string trim [lindex $args 0]]]
|
||||
switch $subcommand {
|
||||
clear -
|
||||
list -
|
||||
uuget {return}
|
||||
write {
|
||||
if { [llength $args] < 2} {
|
||||
error "ERROR: missing file name for $name write"
|
||||
}
|
||||
return
|
||||
}
|
||||
add {
|
||||
if { [llength $args] < 3} {
|
||||
error "ERROR: missing values for $name add"
|
||||
}
|
||||
for { set i 1} { $i < 3} {incr i} {
|
||||
set val [string trim [lindex $args $i]]
|
||||
if { [syntaxNumeric $val] != 1} {
|
||||
error "ERROR: expected numeric arg to $name add, got $val"
|
||||
}
|
||||
}
|
||||
}
|
||||
default {
|
||||
error "ERROR: subcommand $subcommand to $name not recognized"
|
||||
}
|
||||
}
|
||||
}
|
||||
#---------------------------------------------------------------------------
|
||||
# Mappings for some common SICS commands and variables
|
||||
#---------------------------------------------------------------------------
|
||||
sicsSyntaxMap clientput syntaxDummy
|
||||
|
||||
Reference in New Issue
Block a user