diff --git a/config/devices.properties b/config/devices.properties index b3660b1..33921e9 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -41,5 +41,5 @@ gsx=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:X_SP SINEG01-MSOL130:X|||true gsy=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:Y_SP SINEG01-MSOL130:Y|||true gsrx=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:ROT_X_SP SINEG01-MSOL130:ROT_X|||true gsry=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:ROT_Y_SP SINEG01-MSOL130:ROT_Y|||true -camtool=ch.psi.pshell.bs.Camtool|sf-cons-01:10000||| +camtool=ch.psi.pshell.bs.Camtool|localhost:10000||| #SINEG01-DBPM340:Q=ch.psi.pshell.device.Averager|SINEG01-DBPM340:Q|||true diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 6680675..061baa9 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Tue Mar 14 17:01:56 CET 2017 +#Wed Mar 15 10:39:06 CET 2017 colormap=Temperature colormapAutomatic=true colormapMax=0.0 @@ -19,9 +19,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=16859.947265625 -spatialCalOffsetY=16276.595703125 -spatialCalScaleX=-26.761820720381525 -spatialCalScaleY=-26.595744663521685 +spatialCalOffsetX=0.0 +spatialCalOffsetY=0.0 +spatialCalScaleX=1.0 +spatialCalScaleY=1.0 spatialCalUnits=mm transpose=false diff --git a/script/local.py b/script/local.py index 3f01beb..6a16db7 100755 --- a/script/local.py +++ b/script/local.py @@ -267,3 +267,17 @@ if get_context().isServerEnabled(): d.initialize() cas5 = CAS("PSHELL_OP:SERVER_URL", d, 'string') + + +#Managing local camtool server +def is_camtool_running(): + return int(exec_cmd("pgrep cam_server | wc -l")) > 0 + +def run_camtool(): + if is_camtool_running(): + return None + cmd = "source /opt/gfa/python\n" + cmd = cmd + "cam_server -p 10000 -b /afs/psi.ch/intranet/SF/Applications/config/camtool_n &" + return exec_cmd(cmd) + +