sf-mx/PBSwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

majot rework of shapepath.py

Browse Source
This commit is contained in:
zamofing_t
2023-06-23 12:07:48 +02:00
parent ad149fb750
commit 6141dba696
2 changed files with 204 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/MXMotion.py
View File

@@ -25,6 +25,8 @@ Gather.Enable : 1: after .setup_gather() called
Gather.Samples : number af gathered data samples Gather.Samples : number af gathered data samples
''' '''
import logging
_log=logging.getLogger(__name__)
import os,sys,time import os,sys,time
sys.path.insert(0,os.path.expanduser('~/Documents/prj/SwissFEL/PBTools/')) sys.path.insert(0,os.path.expanduser('~/Documents/prj/SwissFEL/PBTools/'))
#import pbtools.misc.pp_comm as pp_comm -> pp_comm.PPComm #import pbtools.misc.pp_comm as pp_comm -> pp_comm.PPComm
@@ -71,10 +73,10 @@ class MotionBase:
sync_flag=self.meta['sync_flag'] sync_flag=self.meta['sync_flag']
pt2pt_time=self.meta['pt2pt_time'] pt2pt_time=self.meta['pt2pt_time']
print({0:'no sync at all',1:'sync at start only',2:'sync on each shot'}[sync_mode]) _log.info({0:'no sync at all',1:'sync at start only',2:'sync on each shot'}[sync_mode])
if sync_mode!=0: if sync_mode!=0:
print({0: 'real start trigger', 1: 'simulated start trigger'}[sync_flag&1]) _log.info({0: 'real start trigger', 1: 'simulated start trigger'}[sync_flag&1])
print({0: 'real frame trigger', 2: 'simulated frame trigger'}[sync_flag&2]) _log.info({0: 'real frame trigger', 2: 'simulated frame trigger'}[sync_flag&2])
self.sync_run = '&{crdId}b{prgId}r'''.format(prgId=prgId, crdId=crdId) self.sync_run = '&{crdId}b{prgId}r'''.format(prgId=prgId, crdId=crdId)

394
python/shapepath.py
View File

File diff suppressed because one or more lines are too long