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

beamtime fixes

Browse Source
This commit is contained in:
zamofing_t
2023-06-28 20:09:27 +02:00
parent 6b86a1c319
commit 3a8ac885f5
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
psi_device.py
View File

@@ -89,9 +89,9 @@ class Jungfrau:
except TypeError as e: except TypeError as e:
_log.warning(f'failed to get _pulse_id_start: {e}') _log.warning(f'failed to get _pulse_id_start: {e}')
if self._daq is not None: if self._daq is not None:
n_pulses_run = n_pulses + run['padding'] #n_pulses_run = n_pulses + run['padding']
self._daq.acquire(run['prefix'], n_pulses=min(n_pulses_run, 5000), n_repeat=ceil(n_pulses_run/5000), wait=False, cell_name=run['cell_name']) #self._daq.acquire(run['prefix'], n_pulses=min(n_pulses_run, 5000), n_repeat=ceil(n_pulses_run/5000), wait=False, cell_name=run['cell_name'])
#self._daq.acquire(run['prefix'], n_pulses=n_pulses, wait=False) self._daq.acquire(run['prefix'], n_pulses=n_pulses, wait=False)
pass pass
#run['id']+=1 #run['id']+=1
cfg.setValue(AppCfg.DAQ_RUN,run) cfg.setValue(AppCfg.DAQ_RUN,run)

2
pyqtUsrObj.py
View File

@@ -427,7 +427,7 @@ class FixTargetFrame(UsrROI):
}, },
'grid':{ 'grid':{
# 240+(12500-78*120)/2=1810 # 240+(12500-78*120)/2=1810
'pos':(1810, 1810), 'pos':(1750, 1750),
'pitch':(120, 120), 'pitch':(120, 120),
'count':(78, 78) #(84,84)... but sone covered 'count':(78, 78) #(84,84)... but sone covered
} }

6
swissmx.py
View File

@@ -143,7 +143,7 @@ import pyqtUsrObj as UsrGO
from epics_widgets.MotorTweak import MotorTweak from epics_widgets.MotorTweak import MotorTweak
from epics_widgets.SmaractMotorTweak import SmaractMotorTweak from epics_widgets.SmaractMotorTweak import SmaractMotorTweak
from epics_widgets.SimMotorTweak import SimMotorTweak from epics_widgets.SimMotorTweak import SimMotorTweak
# from epics import caput, caget # TODO: shutter from epics import caput, caget # TODO: shutter
ts.log('Import part 5/8:') ts.log('Import part 5/8:')
import numpy as np import numpy as np
np.set_printoptions(suppress=True,linewidth=196) np.set_printoptions(suppress=True,linewidth=196)
@@ -2301,7 +2301,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
# TODO: shutter # TODO: shutter
# open fast shutter # open fast shutter
#caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 1) caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 1)
sp.run() # start motion program sp.run() # start motion program
sp.wait_armed() # wait until motors are at first position sp.wait_armed() # wait until motors are at first position
@@ -2333,7 +2333,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch)
# TODO: shutter # TODO: shutter
# clos fast shutter # clos fast shutter
# caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 0) caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 0)
# TODO: shutter # TODO: shutter
# close laser shutter # close laser shutter