From e6c51e8fe943e81e9bca712d05d6db6e979dbf17 Mon Sep 17 00:00:00 2001 From: cvs Date: Tue, 25 Nov 2003 10:29:22 +0000 Subject: [PATCH] - Fixed missalignment in TAS scan messages - Fixed a counting/driving race in devexec - Fixed some problems with sanscheck --- tasscan.c | 8 ++++---- utils/check/amorcheck | 5 +++-- utils/check/dmccheck | 4 +++- utils/check/focuscheck | 4 ++-- utils/check/hrptcheck | 5 +++-- utils/check/sanscheck | 6 ++++-- utils/check/sicssyntaxlib.tcl | 13 +++++++++---- utils/check/topsicheck | 3 ++- utils/check/tricscheck | 4 ++-- 9 files changed, 32 insertions(+), 20 deletions(-) diff --git a/tasscan.c b/tasscan.c index 7fb57b8..1648c76 100644 --- a/tasscan.c +++ b/tasscan.c @@ -122,7 +122,7 @@ static int TASHeader(pScanData self) { pTASdata pTAS = (pTASdata)self->pSpecial; int i, iCount, status, iFileNO; - char pBueffel[1024], pHeader[1024], pWork[132], pWork2[60], pTen[11], *pcPtr; + char pBueffel[1024], pHeader[1024], pWork[132], pWork2[60], pTen[12], *pcPtr; time_t iDate; struct tm *psTime; pVarEntry pVar = NULL; @@ -377,7 +377,7 @@ static int TASHeader(pScanData self) strcpy(pHeader," PNT PAL"); } else { strcpy(pBueffel,"FORMT: (I4,1X,"); - strcpy(pHeader," PNT"); + strcpy(pHeader," PNT "); } for(i = 0; i < self->iScanVar; i++) { @@ -388,7 +388,7 @@ static int TASHeader(pScanData self) strcat(pBueffel,"F9.4,1X,"); strncpy(pWork2,pVar->Name,59); strtoupper(pWork2); - strcenter(pWork2,pTen,10); + strcenter(pWork2,pTen,11); strcat(pHeader,pTen); } } @@ -396,7 +396,7 @@ static int TASHeader(pScanData self) put the standard counter things */ strcat(pBueffel,"F8.0,1X,F8.0,1X,F9.2,1X,F8.0,1X,F8.0,1X,"); - strcat(pHeader," M1 M2 TIME CNTS M3 "); + strcat(pHeader," M1 M2 TIME CNTS M3 "); /* now the additional variables */ diff --git a/utils/check/amorcheck b/utils/check/amorcheck index a679a5d..011e010 100755 --- a/utils/check/amorcheck +++ b/utils/check/amorcheck @@ -6,7 +6,7 @@ # # Mark Koennecke, March 2003 #-------------------------------------------------------------------------- -source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl +source /data/lnslib/bin/sicscheck/sicssyntaxlib.tcl #------------ define AMOR motors and aliases sicsSyntaxMap ftz syntaxMotor @@ -80,7 +80,8 @@ sicsSyntaxMap td syntaxNumPar sicsSyntaxMap aw syntaxNumPar sicsSyntaxMap shutter syntaxTextPar -#syntaxLoadSICS amorstatus.tcl +syntaxLoadSICS /data/lnslib/data/AMOR/2003/amorstatus.tcl + #puts stdout [array names sicsPar] if { $argc < 1} { diff --git a/utils/check/dmccheck b/utils/check/dmccheck index 4f7aca4..db16abd 100755 --- a/utils/check/dmccheck +++ b/utils/check/dmccheck @@ -6,7 +6,7 @@ # # Mark Koennecke, March 2003 #-------------------------------------------------------------------------- -source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl +source /data/lnslib/bin/sicscheck/sicssyntaxlib.tcl #------------------------- define DMC motors and aliases sicsSyntaxMap omegam syntaxMotor @@ -52,6 +52,8 @@ sicsSyntaxMap tt evSyntax #---------- define DMC auxiliary sicsSyntaxMap beam syntaxDummy +syntaxLoadSICS /data/lnslib/data/DMC/2003/dmcstatus.tcl + #--------- Main checking stuff if { $argc < 1} { diff --git a/utils/check/focuscheck b/utils/check/focuscheck index 944b948..227d6be 100755 --- a/utils/check/focuscheck +++ b/utils/check/focuscheck @@ -6,7 +6,7 @@ # # Mark Koennecke, March 2003 #-------------------------------------------------------------------------- -source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl +source /data/lnslib/bin/sicscheck/sicssyntaxlib.tcl #------------ define FOCUS motors and aliases sicsSyntaxMap mtt syntaxMotor @@ -65,7 +65,7 @@ sicsSyntaxMap helium syntaxDummy sicsSyntaxMap mono syntaxDummy #--------- Main checking stuff -#syntaxLoadSICS focusstatus.tcl +#syntaxLoadSICS /data/lnslib/data/FOCUS/2003/focusstatus.tcl #puts stdout [array names sicsPar] if { $argc < 1} { diff --git a/utils/check/hrptcheck b/utils/check/hrptcheck index 241f988..cd41c33 100755 --- a/utils/check/hrptcheck +++ b/utils/check/hrptcheck @@ -6,7 +6,7 @@ # # Mark Koennecke, March 2003 #-------------------------------------------------------------------------- -source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl +source /data/lnslib/bin/sicscheck/sicssyntaxlib.tcl #------------------------- define HRPT motors and aliases sicsSyntaxMap momu syntaxMotor @@ -69,8 +69,9 @@ sicsSyntaxMap tt evSyntax #---------- define HRPT auxiliary sicsSyntaxMap beam syntaxDummy sicsSyntaxMap graphit syntaxTextPar -#--------- Main checking stuff +#--------- Main checking stuff +syntaxLoadSICS /data/lnslib/data/HRPT/2003/hrptstatus.tcl if { $argc < 1} { puts stdout "Usage: \n\thrptcheck filename" exit 0 diff --git a/utils/check/sanscheck b/utils/check/sanscheck index 0b12c90..9cde249 100755 --- a/utils/check/sanscheck +++ b/utils/check/sanscheck @@ -6,7 +6,7 @@ # # Mark Koennecke, March 2003 #-------------------------------------------------------------------------- -source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl +source /data/lnslib/bin/sicscheck/sicssyntaxlib.tcl #------------------------- define SANS motors and aliases sicsSyntaxMap som syntaxMotor @@ -81,12 +81,14 @@ sicsSyntaxMap comment3 syntaxTextPar sicsSyntaxMap fax syntaxTextPar sicsSyntaxMap email syntaxTextPar sicsSyntaxMap sample syntaxTextPar +sicsSyntaxMap batchroot syntaxTextPar sicsSyntaxMap lambda syntaxNumPar sicsSyntaxMap nvs syntaxNumPar #----------- define SANS environment sicsSyntaxMap temperature evSyntax sicsSyntaxMap tt evSyntax +sicsSyntaxMap magnet evSyntax @@ -123,7 +125,7 @@ sicsSyntaxMap SplitReply syntaxDummy sicsSyntaxMap Publish syntaxDummy #--------- Main checking stuff - +syntaxLoadSICS /data/lnslib/data/SANS/2003/sansstat.tcl if { $argc < 1} { puts stdout "Usage: \n\tsanscheck filename" exit 0 diff --git a/utils/check/sicssyntaxlib.tcl b/utils/check/sicssyntaxlib.tcl index 1cf09be..eb65c19 100644 --- a/utils/check/sicssyntaxlib.tcl +++ b/utils/check/sicssyntaxlib.tcl @@ -145,7 +145,9 @@ proc syntaxTextPar {name args} { set args [syntaxListify $args] if { [llength $args] > 0} { - set sicsPar($name) [join $args] + if { [string first setaccess [string tolower [lindex $args 0]]] < 0} { + set sicsPar($name) [join $args] + } } else { if { [info exists sicsPar($name)] == 1} { return [format "%s = %s" $name \ @@ -164,7 +166,10 @@ proc syntaxNumPar {name args} { set args [syntaxListify $args] if { [llength $args] > 0} { if { [syntaxNumeric [lindex $args 0]] == 1} { - set sicsPar($name) [lindex $args 0] + if { [string first setaccess \ + [string tolower [lindex $args 0]]] < 0} { + set sicsPar($name) [lindex $args 0] + } } else { error [format \ "ERROR: expected numeric argument for %s, received: %s" \ @@ -550,7 +555,7 @@ proc count { {mode NULL } { preset NULL } } { return } else { set c [string index $mode 0] - if { [regexp \[mc\] $c] != 1 } { + if { [regexp \[mt\] $c] != 1 } { error "ERROR: invalid counter mode $m specified for count" } } @@ -914,7 +919,7 @@ proc fileeval {name} { #-------------------------------------------------------------------------- proc batchrun {name} { global sicsPar - fileeval $sicspar(batchroot)/$name + fileeval $sicsPar(batchroot)/$name } #--------------------------------------------------------------------------- # The sp command for setting zero points diff --git a/utils/check/topsicheck b/utils/check/topsicheck index 57d98b5..1d18595 100755 --- a/utils/check/topsicheck +++ b/utils/check/topsicheck @@ -6,7 +6,7 @@ # # Mark Koennecke, March 2003 #-------------------------------------------------------------------------- -source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl +source /data/lnslib/bin/sicscheck/sicssyntaxlib.tcl #------------------------- define TOPSI motors and aliases sicsSyntaxMap d1r syntaxMotor @@ -127,6 +127,7 @@ proc dav {w1 w2 w3} { } #--------- Main checking stuff +syntaxLoadSICS /data/lnslib/data/TOPSI/2003/topsistatus.tcl if { $argc < 1} { puts stdout "Usage: \n\ttopsicheck filename" diff --git a/utils/check/tricscheck b/utils/check/tricscheck index 884fd33..63d5211 100755 --- a/utils/check/tricscheck +++ b/utils/check/tricscheck @@ -6,7 +6,7 @@ # # Mark Koennecke, March 2003 #-------------------------------------------------------------------------- -source /data/koenneck/src/sics/utils/check/sicssyntaxlib.tcl +source /data/lnslib/bin/sicscheck/sicssyntaxlib.tcl #------------ define TRICS motors and aliases sicsSyntaxMap momu syntaxMotor @@ -271,7 +271,7 @@ proc lomax args { } } #--------------------------- main program -------------------------------- -#syntaxLoadSICS amorstatus.tcl +syntaxLoadSICS /data/lnslib/data/TRICS/2003/tricsstatus.tcl #puts stdout [array names sicsPar] if { $argc < 1} {