d57416a73e
frappy_psi.sea: more improvements
...
- add sea_path property
- add LscDrivable (config of these modules is easier to understand)
Change-Id: I616dc94de6e784f6d8cfcf080d9a8408cbf73d93
2025-02-13 09:39:11 +01:00
l_samenv
8dcf6ca658
sea: fix parameter name mapping
...
- rel_path = ['tm', '.', 'set'] should mean:
'tm': tm parameters first, with /<obj?/tm as main value
'.': then all parameters directly at top level, except 'set'
'set': all parameters below 'set'
driving happens at object level
- better name mangling (the 1st appearance of the same shortname
is kept short)
2025-02-13 09:39:11 +01:00
bc66a314c4
logdif.py: leave on every input except bare return
...
Change-Id: I3d53c7b45fb9ef09a61be5af13a2cdc4d32d5c7d
2025-02-13 09:38:20 +01:00
6fac63d769
frappy.server: remove comment about opts in SecNode/Dispatcher
...
The options given in the node configuration may be used
for both SecNode (equipment_id) and Dispatcher (when the
frappy.protocol.router.Router is used as dispatcher).
It is correct that both remove the options known to them.
Change-Id: I2a34073e4e5490dcf8db577d9cb74788c0cb657b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34989
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-28 18:04:26 +01:00
e41692bf2c
frappy.server: use server name for SecNode name
...
no need to configure the name of SecNode and Dispatcher
Change-Id: I5199bbd77c74e4fe56b527a5a565a8285b0d831e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34988
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:04:26 +01:00
dff3bd2f24
frappy.server bug fix: server name must not be a list
...
followup error from change 34893
this bug appears in HasComlog, only when comlog is switched on
Change-Id: Ic0db5ae0b0af9981b0c91ebacf2eb6cd704aaa58
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34987
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-28 18:04:26 +01:00
b67e5a9260
updated sync_branches for sinq branch
...
Change-Id: Ic3330c4049b527dc98704fbbd94180dcd4930cb1
2024-11-28 18:04:26 +01:00
4815f4e6b4
follow up change for 'better order of accessibles' (34904)
...
slight change to make it compatible with py 3.6/3.7, where
reversed(<dict>) was not allowed.
Change-Id: Id440870b5523a866b3afb470ba5db9cd6a9bb0ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/35002
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-28 18:04:26 +01:00
e8ec9b415a
improve lakeshore demo
...
use super call for read_status
TODO: update tutorial!
Change-Id: I2dd5631908dc370c6e6286587099e25a0e5ee867
2024-11-28 18:03:37 +01:00
5b9e36180e
frappy_psi.bkpower: improve doc
...
Change-Id: I0736d1d8a40b0140bfdbf5aca189b8ddc5b22973
2024-11-28 18:03:37 +01:00
f1b59e4150
fix bug when overriding a property with bare value
...
the bare value must be converted to a updated property.
add also a test for this
Change-Id: I261daaaa8e12d7f739d8b2e8389c1b871b26c5b3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34985
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
17070ca732
add sim-server again based on socketserver
...
- fix ls370test config file
+ fix issues with frappy_psi.ls370res
+ add frappy_psi.ls370sim
Change-Id: Ie61e3ea01c4b9c7c1286426504e50acf9413a8ba
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34957
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
Jenkins system
d618fafe4b
[deb] Release v0.20.4
2024-11-28 18:03:37 +01:00
Jens Krüger
dd1dfb3094
Lib/config: Create a list of pathes only for confdir
...
Under some condition (no general config file) it's possible that the
piddir and logdir as well are lists of pathes which creates some errors
during the server start
This problems occurs at least in NICOS test suite where no general
config file is defined.
Change-Id: I94c5db927923834c1546dbc34e2490b07b0bf111
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34952
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Jens Krueger <jens.krueger@tum.de >
2024-11-28 18:03:37 +01:00
8d6617e288
frappy.client: catch all errors in handleError callback
...
put try/execpt around handleError callback
Change-Id: I3d97f085556665189da848e52a7148248f55eb0e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34955
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-28 18:03:37 +01:00
Jens Krüger
fdec531c99
PSI: Fix import error on ThermoFisher module
...
Change-Id: I691d8f5057fdb19ba14c109399417a7ee9962637
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34954
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-11-28 18:03:37 +01:00
a246584c4a
frappy.lib.multievent: avoid deadlock
...
use RLock instead of Lock, as queued actions might call
the set/clear methods recursively
Change-Id: Id43aa8669955e6be9f61379d039a4f65eb7b2dc4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34950
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
Georg Brandl
00ef174292
remove unused file
...
Change-Id: I969bfb22f2196227abe8c5ecef628a15e6eb75f1
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34939
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
Jenkins system
ada66f4851
[deb] Release v0.20.3
2024-11-28 18:03:37 +01:00
Alexander Zaft
a9be6475b1
add generalConfig to etc
...
Change-Id: I768b136c803d5e197e3653d1b84e147b62a97676
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34924
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-11-28 18:03:37 +01:00
Georg Brandl
f380289a84
fixup test for cfg_editor utils to run from non-checkout, and fix names, and remove example code
...
Change-Id: I6224244392e2a2d0928065ba24abcbe822096084
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34934
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-11-28 18:03:37 +01:00
Jenkins system
528d80652c
[deb] Release v0.20.2
2024-11-28 18:03:37 +01:00
Alexander Zaft
7c6df58906
fix frappy-server cfgfiles command
...
frappy-server <name> errors after 34893
Change-Id: Ifba758fbabc3aef32e20b683f1c1edbfea711a75
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34913
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2024-11-28 18:03:37 +01:00
Georg Brandl
1851c0ac43
server: better handling of cfgfile argument
...
No reason to keep stringly-typed data on that level
Change-Id: Iba8d88301bf36ef6051031d1916d1bac84ede546
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34893
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-11-28 18:03:37 +01:00
880d472a4a
generalConfig: fix the case when confdir is a list of paths
...
convert all env variable values containing ':' into a list of paths
+ fix one case where an env variable is not converted to a Path
+ remove unused _gcfg_help
Change-Id: Ibc51ab4606ca51e0e87d0fedfac1aca4952f3270
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34872
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 >
2024-11-28 18:03:37 +01:00
Alexander Zaft
25ff96873b
server: service discovery over UDP.
...
implement RFC-005
- server broadcasts once on startup and answers to broadcasts
- small tool for listening on the port and sending broadcasts
Change-Id: I02d1184d6be62bef6f964eb9d238220aef062e94
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34851
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2024-11-28 18:03:37 +01:00
Georg Brandl
82881049c4
systemd: enable indication of reloading/stopping
...
Change-Id: I6dd1b3a50234fb0304fb1a5318f2f22d35d464ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34896
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2024-11-28 18:03:37 +01:00
Alexander Zaft
60c9737cfe
server: fix windows ctrl-c
...
thread.join() blocks indefinetely, not allowing python to handle the
interrupt. Same is true for sleep on windows, but when we only sleep a
second, this is fine. Instead of joining the threads, keep track of them
manually.
Change-Id: I559fe06d9ce005a15388c881e4f076d996aea9dc
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34894
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
Alexander Zaft
632db924eb
generalconfig: streamlined config discovery
...
determine generalconfig file location in order:
- command line argument
- environment variable
- git location (../cfg)
- local location (cwd)
- global location (/etc/frappy)
Change-Id: Ie34bcbd5188837075ee7bb7d5029d676ae72378e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34839
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
Alexander Zaft
261121297b
Revert "config: allow using Prop(...)"
...
This reverts commit ba59bd5498https://forge.frm2.tum.de/review/c/secop/frappy/+/34888
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
Alexander Zaft
1bd243f3d2
config: fix typo
...
Change-Id: Ie90993d9b2d387780fa3faa28fd8d4523f7fc866
2024-11-28 18:03:37 +01:00
Alexander Zaft
7c3f9f7196
config: allow using Prop(...)
...
Still maps to the same logic, but it might be a bit confusing to
configure properties with prop = Param(...)
Change-Id: I6bde6a0b015095a8b765d98cb2780f0d42de7e6e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34886
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-11-28 18:03:37 +01:00
9074dfda9d
fix playground
...
- fix initialization
- add description
Change-Id: Ic210c26edfec709bafa902e32eae04350d571acd
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34874
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
de32eb09e6
better order of accessibles: 'value' 'status' and 'target' first
...
- predefined parameters/commands appear first, in the order
defined in frappy.params.PREDEFINED_ACCESSIBLES
- other (custom) parameters by inheritance order
- remove paramOrder attribute (not used currently)
Change-Id: If4c43189e4837dba057dc0a430ac6c3d1ae10829
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34904
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
2e97f0f0ce
frappy_psi.sea: bugfix: revert change of updateEvent to udpateItem
...
revert some of change 34813
SeaClient is based on ProxyClient, not SecopClient
-> updateItem is not defined there
Change-Id: Ib3049038481917ec7a11b9fb2d285cedff5febbb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34873
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-11-28 18:03:37 +01:00
0b06acf304
add ori2
2024-11-26 15:16:53 +01:00
cc90291358
varioxb: fix config, om not yet available
2024-11-26 13:59:05 +01:00
03b4604643
fix description of ts in ma11stick
2024-11-15 09:14:54 +01:00
l_samenv
ada696e72b
add peltier cfg
2024-11-14 16:09:31 +01:00
l_samenv
1d70a90270
add addon ah2500sea
2024-11-14 16:04:55 +01:00
l_samenv
20da7592da
add PE stick
...
example of how to do a software calibration on a mercury channel
with hardcoded wrong calib curve
2024-11-14 15:40:46 +01:00
l_samenv
e750e69045
ma11stick/ovenstick: fix double meaning entry
2024-11-14 15:39:43 +01:00
l_samenv
11a65b485b
fix ah2700 / ah2550 settings
2024-11-14 15:39:43 +01:00
edf5a5568b
frappy_psi.sea: fix buf, revert change of updateEvent to udpateItem
...
this is not possible in ProxyClient
2024-10-24 13:29:26 +02:00
f382a01d86
fix case where confdir is a list of paths
2024-10-24 11:46:23 +02:00
Alexander Zaft
3c69dcb170
core: fix Dispatcher and SECNode opts handling
...
both tried to consume everything before, also making the check for
unknown options afterwards pointless
Change-Id: I7e44c088163e0b99ac509a2c0f757270807d97ab
Fixes : #4912
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34837
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2024-10-23 09:27:35 +02:00
Alexander Zaft
b889a86461
server: show interfaces as custom property
...
Change-Id: I129be1228b8a04386db5fe370ebdc2ec6ce8050a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34838
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-10-23 09:27:35 +02:00
Alexander Zaft
c7143a6dc7
server: fix positional argument lint
...
Change-Id: Ib718826e7bbce2c6fcc9b39879c30baec1ecaa5a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34845
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-10-23 09:27:35 +02:00
Alexander Zaft
c2a3821000
sim: make amagnet sim cfg startable again
...
Change-Id: I1e7b7dd6e4069c616f49edbe4e223f501a000398
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34844
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-10-23 09:27:35 +02:00
Alexander Zaft
1cebf3998f
simulation: fix extra_params default, ccidu1 cfg
...
Change-Id: I80672f1c070054871708961bc6641457f8e409ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34843
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2024-10-23 09:26:48 +02:00
