- A few fixes to the hsitogram memory codes

- Many fixes for the triple axis code

utils/check/sanscheck

@@ -46,6 +46,10 @@ sicsSyntaxMap sampletable mumoSyntax
 set sicsPar(sampletable.alias) [list omega x y z posi]
 set sicsPar(sampletable.nampos) [list back]
 
+sicsSyntaxMap st mumoSyntax
+set sicsPar(st.alias) [list omega x y z posi]
+set sicsPar(st.nampos) [list back]
+
 sicsSyntaxMap detector mumoSyntax
 set sicsPar(detector.alias) [list x y phi]
 set sicsPar(detector.nampos) [list back]
@@ -100,6 +104,24 @@ sicsSyntaxMap qrange   syntaxNumPar
 sicsSyntaxMap bsin     syntaxDummy
 sicsSyntaxMap bsout    syntaxDummy
 
+#------------- SANS xy-tables
+sicsSyntaxMap xydata0 syntaxXY
+sicsSyntaxMap xydata1 syntaxXY
+sicsSyntaxMap xydata2 syntaxXY
+sicsSyntaxMap xydata3 syntaxXY
+sicsSyntaxMap xydata4 syntaxXY
+sicsSyntaxMap xydata5 syntaxXY
+sicsSyntaxMap xydata6 syntaxXY
+sicsSyntaxMap xydata7 syntaxXY
+sicsSyntaxMap xydata8 syntaxXY
+sicsSyntaxMap xydata9 syntaxXY
+sicsSyntaxMap xydata  syntaxXY
+
+#--------- do we need this?
+sicsSyntaxMap save syntaxDummy
+sicsSyntaxMap SplitReply syntaxDummy
+sicsSyntaxMap Publish syntaxDummy
+
 #--------- Main checking stuff
 
 if { $argc < 1} {
@@ -116,3 +138,7 @@ exit 1
  
 
 
+
+
+
+

utils/check/sicssyntaxlib.tcl

@@ -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