From bd7dff99c54d5d00316a1b764852d2e57d9c6fed Mon Sep 17 00:00:00 2001 From: gac-x07mb Date: Wed, 28 Aug 2024 09:39:23 +0200 Subject: [PATCH] next version --- phoenix_bec/device_configs/phoenix_devices.yaml | 12 +++++------- phoenix_bec/local_scripts/PhoenixTemplate.py | 2 +- phoenix_bec/scans/phoenix_scans.py | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/phoenix_bec/device_configs/phoenix_devices.yaml b/phoenix_bec/device_configs/phoenix_devices.yaml index f5af665..31fa2c9 100644 --- a/phoenix_bec/device_configs/phoenix_devices.yaml +++ b/phoenix_bec/device_configs/phoenix_devices.yaml @@ -61,11 +61,7 @@ PH_Dummy: # - phoenix # - Dummy_Dummy_PSIDetector # - phoenix_devices.yaml -# onFailure: buffer -# enabled: true -# readoutPriority: monitored -# softwareTrigger: false - +# onFailure: buffe ############################ @@ -75,9 +71,11 @@ PH_Dummy: ############################ + + ScanX: readoutPriority: baseline - description: 'Horizontal sample position' + description: 'Vert sample position' deviceClass: ophyd.EpicsMotor deviceConfig: prefix: 'X07MB-ES-MA1:ScanX' @@ -87,7 +85,7 @@ ScanX: onFailure: retry enabled: true readOnly: false - softwareTrigger: false + ScanY: readoutPriority: baseline diff --git a/phoenix_bec/local_scripts/PhoenixTemplate.py b/phoenix_bec/local_scripts/PhoenixTemplate.py index 5f07988..c289a2f 100644 --- a/phoenix_bec/local_scripts/PhoenixTemplate.py +++ b/phoenix_bec/local_scripts/PhoenixTemplate.py @@ -24,7 +24,7 @@ phoenix.add_phoenix_config() #bec.config.update_session_with_file('./ConfigPHOENIX/device_config/phoenix_devices.yaml') time.sleep(1) - +w1. s1=scans.line_scan(dev.ScanX,0,0.1,steps=4,exp_time=.2,relative=False,delay=2) diff --git a/phoenix_bec/scans/phoenix_scans.py b/phoenix_bec/scans/phoenix_scans.py index a55826e..dbbad2e 100644 --- a/phoenix_bec/scans/phoenix_scans.py +++ b/phoenix_bec/scans/phoenix_scans.py @@ -77,7 +77,8 @@ class LogTime(): now=time.time() #delta=now-self.t0 m=str(now)+' sec '+x - logger.success(m) + logger.success(m)custom_prepare_cls(parent=self, **kwargs) + # making the instance of PSID #self.t0=now file=open('MyLogfile.txt','a') file.write(m+'\n')