From e676faaefd3be57d3fea86791b1145796fff6cca Mon Sep 17 00:00:00 2001 From: gac-iss Date: Mon, 20 Jan 2020 09:24:10 +0100 Subject: [PATCH] --- config/devices.properties | 6 +++--- config/plugins.properties | 2 ++ config/variables.properties | 4 ++-- script/templates/EnergyScan.py | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 97f0681..5025a42 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,5 +1,5 @@ i0=ch.psi.pshell.epics.ChannelDouble|X11MA-KEI10:READOUT|Read||true -capture=ch.psi.pshell.epics.ChannelInteger|NAPP-SCIENTA:HDF1:Capture|||false +capture=ch.psi.pshell.epics.ChannelInteger|NAPP-SCIENTA:HDF1:Capture|||true energy=ch.psi.pshell.epics.Positioner|X07DB-OP-MONO:ENERGY X07DB-OP-MONO:ERBK|||true -scienta=ch.psi.pshell.epics.Scienta|NAPP-SCIENTA|||true -spectrum=ch.psi.pshell.imaging.CameraSource|scienta|||true +scienta=Scienta|NAPP-SCIENTA|||true +spectrum=ch.psi.pshell.imaging.CameraSource|scienta||-500|false diff --git a/config/plugins.properties b/config/plugins.properties index 435c38c..067f836 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1 +1,3 @@ +Scienta.java=enabled +ScientaPanel.java=enabled EnergyScan.java=enabled diff --git a/config/variables.properties b/config/variables.properties index 68e942d..4b18f8a 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Thu Jan 16 14:44:27 CET 2020 -FileSequentialNumber=31 +#Thu Jan 16 15:22:14 CET 2020 +FileSequentialNumber=38 diff --git a/script/templates/EnergyScan.py b/script/templates/EnergyScan.py index df40524..605a42f 100644 --- a/script/templates/EnergyScan.py +++ b/script/templates/EnergyScan.py @@ -6,7 +6,7 @@ if get_exec_pars().source == CommandSource.ui: sensors=[i0, scienta.stats[0], scienta.getSpectrum()] -caputq("NAPP-SCIENTA:HDF1:Capture",1) +capture.write(1) def trigger(position, scan): scienta.start() @@ -16,5 +16,5 @@ def trigger(position, scan): try: rscan(energy, sensors, REGIONS, latency = 0.0, before_read=trigger) finally: - caputq("NAPP-SCIENTA:HDF1:Capture",0) + capture.write(0) scienta.zeroSupplies() \ No newline at end of file