From 6fea09eff5b69391e99ccd0126356be9d6a6766a Mon Sep 17 00:00:00 2001 From: gac-x09lb Date: Mon, 3 Oct 2022 09:58:59 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 3 ++- script/local.py | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/config/devices.properties b/config/devices.properties index d8b9b8b..35f4daf 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -2,7 +2,8 @@ current=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT 6|Read||true sample_x=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRX|||true sample_y=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRY|||true sample_z=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRZ|||true -dummy_motor=ch.psi.pshell.device.DummyMotor||||true +dummy_x=ch.psi.pshell.device.DummyMotor||||true +dummy_y=ch.psi.pshell.device.DummyMotor||||true sample_r=ch.psi.pshell.epics.Motor|X09LB-ES3-SAMPLE:ROT1|||true ccd=ch.psi.pshell.epics.AreaDetector|X09LB-ES2-CCD|||true image=ch.psi.pshell.imaging.CameraSource|ccd|||true diff --git a/script/local.py b/script/local.py index 9dc8b0d..7737279 100644 --- a/script/local.py +++ b/script/local.py @@ -2,3 +2,24 @@ # Deployment specific global definitions - executed after startup.py ################################################################################################### + +def is_beam_ok(): + return True + +def wait_beam(): + if not is_beam_ok(): + print "Waiting for beam..." + while not beam_ok: + time.sleep(0.1) + print "Beam ok" + +def before_readout(): + wait_beam() + trig_ccd() + +def after_readout(rec, scan): + if not is_beam_ok(): + rec.invalidate() + +def after_scan(): + pass