linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,247 Commits 18 Branches 1 Tag
ec2bc57ade4609a40a2fd7c5f2bc9cdbab839fed
Commit Graph

1247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Zolliker
8bfe969a95 HasIO: attached io must not be mandatory 
as an uri might be given instead.
 2022-09-08 14:55:36 +02:00
Markus Zolliker
5a78a5b258 fix wrong name (uniax.cfg) 
Change-Id: I7b132aa9474edd93321c74fa9262917d0766879f
 2022-09-08 09:26:01 +02:00
Markus Zolliker
298f94e4d5 update code (remove underscore from attached modules) 
Change-Id: I10bd6bec8f5e9459219f3186fd696e053a264604
 2022-09-08 09:22:32 +02:00
Markus Zolliker
0fec736886 update code in several drivers 
- remove poll arguments
- change from HasIodev to HasIO

Change-Id: I2668f1068c17a50d9aff43b1bb3e4fb03c8d840e
 2022-09-08 09:13:03 +02:00
Markus Zolliker
38b3a192ab fix move_limit in cfg 
Change-Id: Iea99a39155e6172bcc265c350431a438d20f2fc3
 2022-09-08 08:31:38 +02:00
sans
4959619d56 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-09-08 08:27:43 +02:00
sans
6caf4fc993 uniax stick 2022-09-08 08:27:17 +02:00
Markus Zolliker
95eb4e969a change safe current to 0.3, set offset to 15 2022-09-07 13:14:51 +02:00
Markus Zolliker
ada4c43ebf change max force to 190 N 2022-09-07 13:14:51 +02:00
Markus Zolliker
9a40d27354 fix bug in ls340res 
return value must be converted to float
 2022-09-07 13:14:51 +02:00
Markus Zolliker
6929422b94 fox update of param2path dict 
Change-Id: Ie8de3d7f549ba29954058f3d516d1c3965932aa0
 2022-08-24 17:02:21 +02:00
l_samenv
2cd66c2e08 sea: allow multiple parameters being updated with one hdb path 2022-08-24 16:57:27 +02:00
l_samenv
268ebbe00e Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-08-23 17:21:21 +02:00
l_samenv
ea960f2250 fix ln2fill enum 2022-08-23 17:21:01 +02:00
dmc
9673f7b242 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-08-22 15:56:48 +02:00
dmc
292d028fe6 add ill5 p sample stick 2022-08-22 15:55:58 +02:00
boa
aa0c0421c3 add Be-Filter addon for boa 2022-08-19 12:43:36 +02:00
Markus Zolliker
db43a77614 remove some log.debug statements 
in order to sync with frappy@mlz

Change-Id: Iab89cb313fb6969c91663b8ebc56bdcb96ed2dd1
 2022-08-16 17:17:54 +02:00
Markus Zolliker
21bcc7ce98 an enum with value 0 should be interpreted as False 
for example: bool(Enum(off=0, on=1)('off')) is False

Change-Id: Ieb200b4ecf0eed50b657ecc00f73a69810ad828f
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28586
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-08-16 17:16:02 +02:00
Enrico Faulhaber
7b9c099321 default unit to UTF8 
Change-Id: Ic958346beb1a3b164c8d7b2826d59cf7e3991e15
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28946
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2022-08-16 17:14:50 +02:00
Markus Zolliker
33a7c56fa2 allow to convert numpy arrays to ArrayOf 
accept all sequences instead of just tuple / list
+ change Module.announceUpdate to convert value before
  comparing with previous one (comparing will not work with numpy arrays)

Change-Id: I5eceef4297607107e2dde688af2833d3651a8775
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28525
Tested-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-08-16 17:14:38 +02:00
Markus Zolliker
ab2fe6200a reintroduced individual init of generalConfig.defaults 
revert basically the former change
"init generalConfig.defaults only in secop-server"

The problem of import order when setting generalConfig.defaults
has to be solved by not overriding already existing keys when
setting the default.

Change-Id: I82121e346607dd74146279c4241e13ab63c14096
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28011
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-08-16 17:11:56 +02:00
Markus Zolliker
d5d04dc82f add simple interactive python client 
- SECoP modules are accessible as objects in the main python module
- parameters are accessed as attributes of these objects
- __repr__ is used for listing all parameters
- __call__ is used for 'change target and wait until no more busy'

typically used from a python interpreter or in a jupyter notebook

Change-Id: Idb55684eeff6d1262e5d1517a3ff934f1c1bf208
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28980
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-08-16 17:08:18 +02:00
camea
f23e42de1f fix bugs with persistent_limit parameter 
take into account that reading the switch heater might be delayed
 2022-08-16 16:54:30 +02:00
Markus Zolliker
2f6954c4f3 magfield: add persistent_limit parameter 
- use update_switch_heater instead of write_switch_heater
  for detecting switch time
- switch_time split into switch_on_time/switch_off_time

Change-Id: Id90a8b2c2520e24f3ee4a34aee25d41210e5d6d4
 2022-08-16 10:05:01 +02:00
dmc
b81fc7b122 remove tm from ill5.cfg 
only one SeaDrivable per sea drivable allowed!
 2022-08-15 16:22:02 +02:00
camea
704bba292a add mb11 stick 2022-08-12 15:13:07 +02:00
camea
f1e642b1b0 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-08-12 15:12:23 +02:00
camea
8e3cdc80e4 improvements in magfiels/ips_mercury 
- read voltage
- fix a bug with ._init name conflict
 2022-08-12 15:10:23 +02:00
Markus Zolliker
43880346d6 add simple interactive python client 
- SECoP modules are accessible as objects in the main python module
- parameters are accessed as attributes of these objects
- __repr__ is used for listing all parameters
- __call__ is used for 'change target and wait until no more busy'

typically used from a python interpreter or in a jupyter notebook

Change-Id: Idb55684eeff6d1262e5d1517a3ff934f1c1bf208
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28980
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-08-11 11:15:40 +02:00
Jenkins system
d0794a7803 [deb] Release v0.13.1 2022-08-02 15:31:52 +02:00
Enrico Faulhaber
dc76ac92de secop_mlz: minor rework entangle client 
Change-Id: Ie406b4220c22cdbf302a1fd36f2d7407d81a47fa
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28951
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2022-08-02 15:30:53 +02:00
Markus Zolliker
8579368259 make startup faster in case of errors 
When the io of one SECoP module fails, it takes ages to startup
because each parameter poll takes the time to wait for a timeout.
After the first communication error on an io, no more startup polls
are tried on the modules using this io.

Change-Id: I0d250953dfe91a7d68d2d2b108395cc25d471afe
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28588
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-08-02 11:52:57 +02:00
Markus Zolliker
cd90385e6c an enum with value 0 should be interpreted as False 
for example: bool(Enum(off=0, on=1)('off')) is False

Change-Id: Ieb200b4ecf0eed50b657ecc00f73a69810ad828f
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28586
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2022-08-02 11:37:56 +02:00
camea
3496e391f6 check for last_target in conditions for redo 2022-08-02 11:19:30 +02:00
Jenkins system
3acea5f7c7 [deb] Release v0.13.0 2022-08-02 09:47:07 +02:00
Enrico Faulhaber
c564ae392c default unit to UTF8 
Change-Id: Ic958346beb1a3b164c8d7b2826d59cf7e3991e15
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28946
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2022-08-02 09:46:02 +02:00
camea
bb40a0820c use flag instead tolerance for redo check 
when target is changed, a flag is set, and
this is used to jump back in the sequence to the right step
for redoing
 2022-07-29 15:12:44 +02:00
l_samenv
8f739b11dc ILL1 .cfg created and ILL1stick 2022-07-06 16:14:16 +02:00
l_samenv
7ef386424c Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-07-06 11:24:56 +02:00
l_samenv
53b3dd2fad fix stick motor port number on ma02-ts 2022-07-06 11:24:27 +02:00
focus
6554e5de47 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-07-05 11:02:15 +02:00
focus
60ec1edb32 fix He-fill enum 2022-07-05 11:00:35 +02:00
focus
131082313d added stick-motor addon 2022-07-05 10:57:43 +02:00
tasp
f12b0b3da0 add ill5 gas pressure stick 
not yet tested
 2022-07-04 14:23:51 +02:00
tasp
5ecd9557a3 add lev to ill5 cfg 2022-07-04 14:23:08 +02:00
l_samenv
3769ddca75 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-06-29 11:51:01 +02:00
l_samenv
a4dec7b832 fix ill5 cfg 2022-06-29 11:49:51 +02:00
Markus Zolliker
390af7eff7 improve general config 
for easier configuration of multiple servers on the same machine,
FRAPPY_* env. variables are overriding the values from the
general config file

Change-Id: Ifb00dae482dd366bd4b7951c76164af91cad9fc2
 2022-06-29 11:42:33 +02:00
focus
f495313018 dil2/3/4: added more temperatures, added dil3 2022-06-28 08:22:13 +02:00