gac-alvra (Resp.Milne Christopher) 21761e10db Merge branch 'master' of https://git.psi.ch/swissfel/eco ...

Conflicts:
	xoptics/dcm.py

likely breaking something, committing from gac-alvra on saresa-cons-03

2018-02-28 18:50:52 +01:00

..

alvra.py

updated Alvra aliases and DCM class

2018-02-28 18:46:57 +01:00

bernina.py

Changed Delay stage class, which takes now a stage as input and changed time from picoseconds to seconds. Added Ioxos DAQ. Added Ioxos scan (scansIoxos). The default channels for the Ioxos is in /sf/bernina/config/default_channels/default_channel_list_ioxos. gps is still failing to load

2018-02-28 17:43:10 +01:00