160 Commits

Author SHA1 Message Date
gac-x07ma
87c6c4e32f fix magnets prefix 2023-03-01 11:33:44 +01:00
Xiaoqiang Wang
c406c822b3 X07MA devices imported from PShell devices 2023-02-27 15:51:27 +01:00
376d8c2ad7 Add LICENSE 2023-01-25 14:25:15 +00:00
73209552cc Merge branch 'fix-mokev-mono-offests' into 'master'
Adding Theta2 offsets to mono

See merge request bec/ophyd_devices!13
2022-12-01 10:10:44 +00:00
Mohacsi Istvan
0bffecc201 Testing, fixing and blacking 2022-12-01 11:01:01 +01:00
6b2011318d Adding Theta2 offsets to mono 2022-12-01 10:44:17 +01:00
e20588
dacfd1c39b fix: fixed timestamp update for bpm4i 2022-11-30 11:39:51 +01:00
e20588
4c6b7f8721 fix: fixed bpm4i for subs 2022-11-29 18:34:30 +01:00
e11ef9533c Merge branch 'feat-combined-channels' into 'master'
Two solutions for combined EPICS PVs

See merge request bec/ophyd_devices!11
2022-11-29 16:13:22 +00:00
Mohacsi Istvan
5ecdf39457 Added to ini files 2022-11-29 17:12:07 +01:00
Mohacsi Istvan
60708d54cb Added to ini files 2022-11-29 17:10:31 +01:00
Mohacsi Istvan
f3a14ab8b4 Blacked on 3.10 2022-11-29 17:03:42 +01:00
Mohacsi Istvan
3e5c951a14 With a simple Signal 2022-11-29 17:00:56 +01:00
e044d7f8ab Older blacking 2022-11-29 14:47:09 +01:00
Mohacsi Istvan
ae59265ef7 Two solutions for combined PVs 2022-11-29 14:40:08 +01:00
c1cb33e0fc Merge branch 'sls_info' into 'master'
fix: online fixes

See merge request bec/ophyd_devices!10
2022-11-29 09:39:13 +00:00
e20588
9e938f3745 fix: formatter 2022-11-29 10:38:01 +01:00
e20588
1395044432 fix: online fixes 2022-11-29 10:33:16 +01:00
48a55032cd Merge branch 'csaxs_prep' into 'master'
fix: fixed epics import

See merge request bec/ophyd_devices!9
2022-11-27 07:53:33 +00:00
b5611d20c8 fix: removed matplotlib dependency 2022-11-27 08:52:35 +01:00
ec3a93f96e fix: fixed epics import 2022-11-27 08:47:58 +01:00
d9bdc19ad1 Merge branch 'sls_info' into 'master'
Sls info

See merge request bec/ophyd_devices!8
2022-11-25 18:06:57 +00:00
7bd602c49c refactor: cleanup 2022-11-25 19:06:04 +01:00
e119f122de Merge branch 'feature-first-epics-devices' into 'master'
First EPICS devices from controls repo

See merge request bec/ophyd_devices!1
2022-11-24 15:52:27 +00:00
7adb38ddfc Older blacking 2022-11-23 12:09:05 +01:00
9c27f8f999 Merge branch 'virtual-motors-for-detector' into 'feature-first-epics-devices'
Virtual motors for detector

See merge request bec/ophyd_devices!7
2022-11-23 10:22:38 +00:00
Mohacsi Istvan
c9abd2a9da Blacked 2022-11-23 11:21:04 +01:00
Mohacsi Istvan
a0a0c1398d Tested monochromator virtual axes 2022-11-23 11:14:33 +01:00
Mohacsi Istvan
bbf53a3e64 Mono motors in read only mode 2022-11-22 17:52:45 +01:00
Mohacsi Istvan
fd7208ed3e All devices instantiate 2022-11-22 13:44:28 +01:00
c483b50043 Adding virtual otors for mono bender and detector 2022-11-22 13:29:10 +01:00
Mohacsi Istvan
7bb9c11249 Flaking 2022-11-18 16:24:23 +01:00
Mohacsi Istvan
6c2ae5c166 Better config 2022-11-18 16:19:28 +01:00
Mohacsi Istvan
5725af8307 Output formatting 2022-11-18 13:58:39 +01:00
Wakonig Klaus
62054c56af bug fixes for sls devices 2022-11-18 09:59:49 +01:00
e0c0469795 added auto_monitor forwarder to sls_info 2022-11-17 19:50:11 +01:00
8c6a96ca2c Merge branch 'sls_info' of gitlab.psi.ch:/bec/ophyd_devices into sls_info 2022-11-17 19:36:46 +01:00
Wakonig Klaus
08a8272ac0 removed duplicated pv 2022-11-17 19:36:13 +01:00
e20588
7bf193eaa6 improvements for sls info 2022-11-17 18:19:47 +01:00
cb1549cf2d Flaking 2022-11-15 19:09:21 +01:00
5f251db891 Flaking 2022-11-15 19:03:55 +01:00
15950e6d05 Small chanege 2022-11-14 18:04:36 +01:00
3a7dd4e3cf Codestyle 2022-11-14 18:00:18 +01:00
c7867a910f Flaking 2022-11-14 17:37:03 +01:00
gac-x12sa
19f5f728cc Added insertion device proxy 2022-11-14 16:33:47 +01:00
gac-x12sa
82a37ceb38 A few more fixes 2022-11-14 15:43:49 +01:00
gac-x12sa
8b74d08097 XBPM proxies 2022-11-14 15:19:35 +01:00
2443269371 Added device factory 2022-11-14 14:18:58 +01:00
0397ec4323 Merge branch 'sls_info' into 'master'
Sls info

See merge request bec/ophyd_devices!6
2022-11-11 20:02:12 +00:00
f5096a90e5 Merge branch 'master' into sls_info 2022-11-11 20:17:08 +01:00