- Added Sycamore protocol and command context to SICS
- Added sinfo to SICS - Added driver for TCP/IP Astrium velocity selector - Added driver for TCP/IP Astrium chopper controller SKIPPED: psi/amor2t.c psi/amorstat.c psi/dornier2.c psi/ecb.c psi/el734hp.c psi/fowrite.c psi/libpsi.a psi/make_gen psi/nextrics.c psi/pardef.c psi/pimotor.c psi/pipiezo.c psi/polterwrite.c psi/psi.c psi/scontroller.c psi/serial.c psi/tasinit.c psi/tasscan.c psi/tcpdocho.c psi/tcpdornier.c psi/tricssupport.c psi/velodornier.c
This commit is contained in:
koennecke
@ -1,3 +1,3 @@
|
||||
106
|
||||
119
|
||||
NEVER, EVER modify or delete this file
|
||||
You'll risk eternal damnation and a reincarnation as a cockroach!|n
|
||||
@ -38,7 +38,8 @@ proc mcstasdump {pid} {
|
||||
error "Trying to dump invalid PID: $pid"
|
||||
}
|
||||
clientput "Dumping ..."
|
||||
catch {eval exec /usr/bin/kill -USR2 $pid}
|
||||
# catch {eval exec /usr/bin/kill -USR2 $pid}
|
||||
catch {eval exec /bin/kill -USR2 $pid}
|
||||
wait $mcwaittime
|
||||
}
|
||||
#-----------------------------------------------------------------------
|
||||
@ -49,7 +50,9 @@ proc mcstasdump {pid} {
|
||||
# the Unix FAQ this is the best solution......
|
||||
#----------------------------------------------------------------------
|
||||
proc readPID {pid} {
|
||||
set f [ open "| /bin/ps -up $pid" r]
|
||||
# set f [ open "| /bin/ps -up $pid" r]
|
||||
# This is system dependent. The above works for SL, below for Suse
|
||||
set f [ open "| /bin/ps up $pid" r]
|
||||
set pstxt [read $f]
|
||||
close $f
|
||||
return $pstxt
|
||||
@ -57,12 +60,14 @@ proc readPID {pid} {
|
||||
#----------------------------------------------------------------------
|
||||
proc mcstasisrunning {pid} {
|
||||
global runningCount runningLast
|
||||
|
||||
|
||||
# clientput "Checking McStas PID $pid"
|
||||
if { $pid <= 0} {
|
||||
return 0
|
||||
}
|
||||
set pstxt " "
|
||||
set ret [catch {set pstxt [readPID $pid]} msg]
|
||||
# clientput "pstext = $pstxt"
|
||||
set pslist [split $pstxt "\n"]
|
||||
if { [llength $pslist] < 2} {
|
||||
return 0
|
||||
@ -84,13 +89,17 @@ proc mcstaskill {pid} {
|
||||
error "Trying to kill invalid PID $pid"
|
||||
}
|
||||
clientput "Killing $pid"
|
||||
catch {eval exec /usr/bin/kill -TERM $pid}
|
||||
# catch {eval exec /usr/bin/kill -TERM $pid} msg
|
||||
# On Suse kill is /bin/kill, on others it is /usr/bin/kill
|
||||
catch {eval exec /bin/kill -TERM $pid} msg
|
||||
clientput "Kill message $msg"
|
||||
# catch {mccontrol finish}
|
||||
wait 10
|
||||
}
|
||||
#-----------------------------------------------------------------------
|
||||
proc mcinstall {} {
|
||||
allowexec /usr/bin/kill
|
||||
allowexec /bin/kill
|
||||
allowexec /bin/ps
|
||||
Publish mcstasdump User
|
||||
Publish mcstasisrunning User
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# --------------------------------------------------------------------------
|
||||
# --------------------------------------------------------------------------
|
||||
# Initialization script for a virtual DMC instrument using a McStas
|
||||
# simulationas a data source
|
||||
#
|
||||
@ -6,12 +6,12 @@
|
||||
#---------------------------------------------------------------------------
|
||||
# O P T I O N S
|
||||
|
||||
set home $env(HOME)/src/workspace/sics/mcstas/dmc
|
||||
set home $env(HOME)/psi/sics/mcstas/dmc
|
||||
|
||||
#--------------------------------- first all the server options are set
|
||||
#ServerOption RedirectFile $home/stdcdmc
|
||||
ServerOption ReadTimeOut 1
|
||||
ServerOption AcceptTimeOut 1
|
||||
ServerOption ReadTimeOut 10
|
||||
ServerOption AcceptTimeOut 10
|
||||
ServerOption ReadUserPasswdTimeout 500000
|
||||
ServerOption LogFileBaseName "$home/vdmclog"
|
||||
ServerOption LogFileDir $home/
|
||||
@ -137,3 +137,13 @@ source $home/vdmccom.tcl
|
||||
#-------------------- configure commandlog
|
||||
commandlog auto
|
||||
commandlog intervall 5
|
||||
|
||||
#----------- enable sycamore
|
||||
InstallProtocolHandler
|
||||
InstallSinfox
|
||||
source sycFormat.tcl
|
||||
source /usr/lib/tcllib1.6.1/stooop/stooop.tcl
|
||||
namespace import stooop::*
|
||||
source sinfo.tcl
|
||||
source sycamore.tcl
|
||||
Publish sinfo Spy
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
source $home/mcsupport.tcl
|
||||
|
||||
if { [info exists vdmcinit] == 0 } {
|
||||
set vdmcinit 1
|
||||
set vdmcinit 1f
|
||||
Publish LogBook Spy
|
||||
Publish count User
|
||||
Publish Repeat User
|
||||
@ -187,10 +187,9 @@ proc copydmcdata { } {
|
||||
mcreader insertmon \
|
||||
"/$mcversion/DMC_diff/dmc.xml/PSD_sample/values" \
|
||||
counter 1 [expr 1./350]
|
||||
mcreader insertmon \
|
||||
"/$mcversion/DMC_diff/dmc.xml/Det9/det9.dat/values" \
|
||||
counter 4
|
||||
set hmScale [SplitReply [counter getmonitor 4]]
|
||||
# mcreader insertmon \
|
||||
# "/$mcversion/DMC_diff/dmc.xml/Det9/det9.dat/values" \
|
||||
# counter 4
|
||||
set val [mcreader getfield\
|
||||
"/$mcversion/DMC_diff/dmc.xml/Det9/det9.dat/values"]
|
||||
set l [split $val]
|
||||
@ -212,7 +211,6 @@ proc dmcdump {pid} {
|
||||
#--do nothing: progress is doing it for us
|
||||
}
|
||||
#--------------------------------------------------------------------------
|
||||
#mccontrol configure mcstart rundmcsim
|
||||
mccontrol configure mcstart rundmcoptsim
|
||||
mccontrol configure mccopydata copydmcdata
|
||||
mccontrol configure update 30
|
||||
|
||||
@ -201,13 +201,13 @@ a9 precision 0.010000
|
||||
a9 ignorefault 0.000000
|
||||
a9 AccessCode 2.000000
|
||||
a9 movecount 10.000000
|
||||
title UNKNOWN
|
||||
title D3C
|
||||
title setAccess 2
|
||||
user UNKNOWN
|
||||
user setAccess 2
|
||||
collimation UNKNOWN
|
||||
collimation setAccess 2
|
||||
sampleintern na2ca3al2f14
|
||||
sampleintern D3C
|
||||
sampleintern setAccess 2
|
||||
comment1 UNKNOWN
|
||||
comment1 setAccess 2
|
||||
@ -215,7 +215,7 @@ comment2 UNKNOWN
|
||||
comment2 setAccess 2
|
||||
comment3 UNKNOWN
|
||||
comment3 setAccess 2
|
||||
starttime 2005-10-19 11:11:44
|
||||
starttime 2005-12-20 05:13:05
|
||||
starttime setAccess 2
|
||||
adress UNKNOWN
|
||||
adress setAccess 2
|
||||
|
||||
Reference in New Issue
Block a user