linse/sicspsi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixed missalignment in TAS scan messages

Browse Source 
- Fixed a counting/driving race in devexec
- Fixed some problems with sanscheck
This commit is contained in:
cvs
2003-11-25 10:29:22 +00:00
parent d08d1c68bb
commit e6c51e8fe9
9 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tasscan.c
View File

@ -122,7 +122,7 @@ static int TASHeader(pScanData self)
{ {
pTASdata pTAS = (pTASdata)self->pSpecial; pTASdata pTAS = (pTASdata)self->pSpecial;
int i, iCount, status, iFileNO; 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; time_t iDate;
struct tm *psTime; struct tm *psTime;
pVarEntry pVar = NULL; pVarEntry pVar = NULL;
@ -377,7 +377,7 @@ static int TASHeader(pScanData self)
strcpy(pHeader," PNT PAL"); strcpy(pHeader," PNT PAL");
} else { } else {
strcpy(pBueffel,"FORMT: (I4,1X,"); strcpy(pBueffel,"FORMT: (I4,1X,");
strcpy(pHeader," PNT"); strcpy(pHeader," PNT ");
} }
for(i = 0; i < self->iScanVar; i++) for(i = 0; i < self->iScanVar; i++)
{ {
@ -388,7 +388,7 @@ static int TASHeader(pScanData self)
strcat(pBueffel,"F9.4,1X,"); strcat(pBueffel,"F9.4,1X,");
strncpy(pWork2,pVar->Name,59); strncpy(pWork2,pVar->Name,59);
strtoupper(pWork2); strtoupper(pWork2);
strcenter(pWork2,pTen,10); strcenter(pWork2,pTen,11);
strcat(pHeader,pTen); strcat(pHeader,pTen);
} }
} }

5
utils/check/amorcheck
View File

@ -6,7 +6,7 @@
# #
# Mark Koennecke, March 2003 # 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 #------------ define AMOR motors and aliases
sicsSyntaxMap ftz syntaxMotor sicsSyntaxMap ftz syntaxMotor
@ -80,7 +80,8 @@ sicsSyntaxMap td syntaxNumPar
sicsSyntaxMap aw syntaxNumPar sicsSyntaxMap aw syntaxNumPar
sicsSyntaxMap shutter syntaxTextPar sicsSyntaxMap shutter syntaxTextPar
#syntaxLoadSICS amorstatus.tcl syntaxLoadSICS /data/lnslib/data/AMOR/2003/amorstatus.tcl
#puts stdout [array names sicsPar] #puts stdout [array names sicsPar]
if { $argc < 1} { if { $argc < 1} {

4
utils/check/dmccheck
View File

@ -6,7 +6,7 @@
# #
# Mark Koennecke, March 2003 # 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 #------------------------- define DMC motors and aliases
sicsSyntaxMap omegam syntaxMotor sicsSyntaxMap omegam syntaxMotor
@ -52,6 +52,8 @@ sicsSyntaxMap tt evSyntax
#---------- define DMC auxiliary #---------- define DMC auxiliary
sicsSyntaxMap beam syntaxDummy sicsSyntaxMap beam syntaxDummy
syntaxLoadSICS /data/lnslib/data/DMC/2003/dmcstatus.tcl
#--------- Main checking stuff #--------- Main checking stuff
if { $argc < 1} { if { $argc < 1} {

4
utils/check/focuscheck
View File

@ -6,7 +6,7 @@
# #
# Mark Koennecke, March 2003 # 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 #------------ define FOCUS motors and aliases
sicsSyntaxMap mtt syntaxMotor sicsSyntaxMap mtt syntaxMotor
@ -65,7 +65,7 @@ sicsSyntaxMap helium syntaxDummy
sicsSyntaxMap mono syntaxDummy sicsSyntaxMap mono syntaxDummy
#--------- Main checking stuff #--------- Main checking stuff
#syntaxLoadSICS focusstatus.tcl #syntaxLoadSICS /data/lnslib/data/FOCUS/2003/focusstatus.tcl
#puts stdout [array names sicsPar] #puts stdout [array names sicsPar]
if { $argc < 1} { if { $argc < 1} {

5
utils/check/hrptcheck
View File

@ -6,7 +6,7 @@
# #
# Mark Koennecke, March 2003 # 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 #------------------------- define HRPT motors and aliases
sicsSyntaxMap momu syntaxMotor sicsSyntaxMap momu syntaxMotor
@ -69,8 +69,9 @@ sicsSyntaxMap tt evSyntax
#---------- define HRPT auxiliary #---------- define HRPT auxiliary
sicsSyntaxMap beam syntaxDummy sicsSyntaxMap beam syntaxDummy
sicsSyntaxMap graphit syntaxTextPar sicsSyntaxMap graphit syntaxTextPar
#--------- Main checking stuff
#--------- Main checking stuff
syntaxLoadSICS /data/lnslib/data/HRPT/2003/hrptstatus.tcl
if { $argc < 1} { if { $argc < 1} {
puts stdout "Usage: \n\thrptcheck filename" puts stdout "Usage: \n\thrptcheck filename"
exit 0 exit 0

6
utils/check/sanscheck
View File

@ -6,7 +6,7 @@
# #
# Mark Koennecke, March 2003 # 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 #------------------------- define SANS motors and aliases
sicsSyntaxMap som syntaxMotor sicsSyntaxMap som syntaxMotor
@ -81,12 +81,14 @@ sicsSyntaxMap comment3 syntaxTextPar
sicsSyntaxMap fax syntaxTextPar sicsSyntaxMap fax syntaxTextPar
sicsSyntaxMap email syntaxTextPar sicsSyntaxMap email syntaxTextPar
sicsSyntaxMap sample syntaxTextPar sicsSyntaxMap sample syntaxTextPar
sicsSyntaxMap batchroot syntaxTextPar
sicsSyntaxMap lambda syntaxNumPar sicsSyntaxMap lambda syntaxNumPar
sicsSyntaxMap nvs syntaxNumPar sicsSyntaxMap nvs syntaxNumPar
#----------- define SANS environment #----------- define SANS environment
sicsSyntaxMap temperature evSyntax sicsSyntaxMap temperature evSyntax
sicsSyntaxMap tt evSyntax sicsSyntaxMap tt evSyntax
sicsSyntaxMap magnet evSyntax
@ -123,7 +125,7 @@ sicsSyntaxMap SplitReply syntaxDummy
sicsSyntaxMap Publish syntaxDummy sicsSyntaxMap Publish syntaxDummy
#--------- Main checking stuff #--------- Main checking stuff
syntaxLoadSICS /data/lnslib/data/SANS/2003/sansstat.tcl
if { $argc < 1} { if { $argc < 1} {
puts stdout "Usage: \n\tsanscheck filename" puts stdout "Usage: \n\tsanscheck filename"
exit 0 exit 0

9
utils/check/sicssyntaxlib.tcl
View File

@ -145,7 +145,9 @@ proc syntaxTextPar {name args} {
set args [syntaxListify $args] set args [syntaxListify $args]
if { [llength $args] > 0} { if { [llength $args] > 0} {
if { [string first setaccess [string tolower [lindex $args 0]]] < 0} {
set sicsPar($name) [join $args] set sicsPar($name) [join $args]
}
} else { } else {
if { [info exists sicsPar($name)] == 1} { if { [info exists sicsPar($name)] == 1} {
return [format "%s = %s" $name \ return [format "%s = %s" $name \
@ -164,7 +166,10 @@ proc syntaxNumPar {name args} {
set args [syntaxListify $args] set args [syntaxListify $args]
if { [llength $args] > 0} { if { [llength $args] > 0} {
if { [syntaxNumeric [lindex $args 0]] == 1} { if { [syntaxNumeric [lindex $args 0]] == 1} {
if { [string first setaccess \
[string tolower [lindex $args 0]]] < 0} {
set sicsPar($name) [lindex $args 0] set sicsPar($name) [lindex $args 0]
}
} else { } else {
error [format \ error [format \
"ERROR: expected numeric argument for %s, received: %s" \ "ERROR: expected numeric argument for %s, received: %s" \
@ -550,7 +555,7 @@ proc count { {mode NULL } { preset NULL } } {
return return
} else { } else {
set c [string index $mode 0] 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" error "ERROR: invalid counter mode $m specified for count"
} }
} }
@ -914,7 +919,7 @@ proc fileeval {name} {
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
proc batchrun {name} { proc batchrun {name} {
global sicsPar global sicsPar
fileeval $sicspar(batchroot)/$name fileeval $sicsPar(batchroot)/$name
} }
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# The sp command for setting zero points # The sp command for setting zero points

3
utils/check/topsicheck
View File

@ -6,7 +6,7 @@
# #
# Mark Koennecke, March 2003 # 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 #------------------------- define TOPSI motors and aliases
sicsSyntaxMap d1r syntaxMotor sicsSyntaxMap d1r syntaxMotor
@ -127,6 +127,7 @@ proc dav {w1 w2 w3} {
} }
#--------- Main checking stuff #--------- Main checking stuff
syntaxLoadSICS /data/lnslib/data/TOPSI/2003/topsistatus.tcl
if { $argc < 1} { if { $argc < 1} {
puts stdout "Usage: \n\ttopsicheck filename" puts stdout "Usage: \n\ttopsicheck filename"

4
utils/check/tricscheck
View File

@ -6,7 +6,7 @@
# #
# Mark Koennecke, March 2003 # 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 #------------ define TRICS motors and aliases
sicsSyntaxMap momu syntaxMotor sicsSyntaxMap momu syntaxMotor
@ -271,7 +271,7 @@ proc lomax args {
} }
} }
#--------------------------- main program -------------------------------- #--------------------------- main program --------------------------------
#syntaxLoadSICS amorstatus.tcl syntaxLoadSICS /data/lnslib/data/TRICS/2003/tricsstatus.tcl
#puts stdout [array names sicsPar] #puts stdout [array names sicsPar]
if { $argc < 1} { if { $argc < 1} {