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

changes of John and Martin

Browse Source
This commit is contained in:
zamofing_t
2023-11-28 12:01:11 +01:00
parent d7556bc8c0
commit fd3d36396d
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
psi_device.py
View File

@@ -40,8 +40,7 @@ class Shutter:
_log.info('open simulated shutter')
elif mode==1:
# open laser shutter
# epics.caput("SLAAR02-LMOT-M262:MOT.VAL", 1)
# time.sleep(4)
epics.caput("SLAAR31-LPSYS-ESC:LHX1_SHUT_OPEN", 1)
# open fast shutter
epics.caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 1)
@@ -56,7 +55,7 @@ class Shutter:
epics.caput("SARES30-LTIM01-EVR0:RearUniv0-Ena-SP", 0)
# close laser shutter
# caput("SLAAR02-LMOT-M262:MOT.VAL", 40)
epics.caput("SLAAR31-LPSYS-ESC:LHX1_SHUT_CLOSE", 1)
_log.info('shutter closed')
class Deltatau:
@@ -124,8 +123,8 @@ class Jungfrau:
_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)
self._daq.acquire(run['prefix'], n_pulses=min(n_pulses_run, 800), n_repeat=ceil(n_pulses_run/800), wait=False, cell_name=run['cell_name'])
#self._daq.acquire(run['prefix'], n_pulses=n_pulses, wait=False, cell_name=run['cell_name'])
pass
#run['id']+=1
cfg.setValue(AppCfg.DAQ_RUN,run)