diff --git a/psi_device.py b/psi_device.py index 257bbb0..fb60bc5 100644 --- a/psi_device.py +++ b/psi_device.py @@ -89,9 +89,9 @@ class Jungfrau: except TypeError as e: _log.warning(f'failed to get _pulse_id_start: {e}') if self._daq is not None: - 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=n_pulses, wait=False) + #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=n_pulses, wait=False) pass #run['id']+=1 cfg.setValue(AppCfg.DAQ_RUN,run) diff --git a/pyqtUsrObj.py b/pyqtUsrObj.py index aa2f476..d093009 100644 --- a/pyqtUsrObj.py +++ b/pyqtUsrObj.py @@ -427,7 +427,7 @@ class FixTargetFrame(UsrROI): }, 'grid':{ # 240+(12500-78*120)/2=1810 - 'pos':(1810, 1810), + 'pos':(1750, 1750), 'pitch':(120, 120), 'count':(78, 78) #(84,84)... but sone covered } diff --git a/swissmx.py b/swissmx.py index 619c4c4..2e55263 100755 --- a/swissmx.py +++ b/swissmx.py @@ -143,7 +143,7 @@ import pyqtUsrObj as UsrGO from epics_widgets.MotorTweak import MotorTweak from epics_widgets.SmaractMotorTweak import SmaractMotorTweak 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:') import numpy as np np.set_printoptions(suppress=True,linewidth=196) @@ -2301,7 +2301,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) # TODO: 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.wait_armed() # wait until motors are at first position @@ -2333,7 +2333,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) # TODO: shutter # clos fast shutter - # caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 0) + caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 0) # TODO: shutter # close laser shutter