Georg Brandl
19d5756eb0
install pytango for testing
...
Change-Id: I04e0dbc6d59b388dbcf6657b8815642fcdc25094
2024-10-17 08:07:11 +02:00
Georg Brandl
d6b31222b6
new setuptools needs new importlib_metadata
...
Change-Id: Ie4220f7ec2c11b3dcf64c65b3ed97a3d9129af5c
2024-10-17 08:07:11 +02:00
Georg Brandl
b3a2f33151
ci/Dockerfile: do no use pytango from upstream
...
Change-Id: Ie002aff67e0fb4d6daf6f621c58be8c5ab71af9d
2024-10-17 08:07:11 +02:00
Georg Brandl
380c8108eb
remove old "buffer" message
...
Change-Id: I010f535ec746ef15ccfc2929a2e62ccb83894c33
2024-10-17 08:07:11 +02:00
Enrico Faulhaber
cde09694a5
ci: also install gui requirements for additional tests
...
Change-Id: Idc40699d470fb6449366a1cd75a3207cabcdd4a4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34815
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-10-17 08:07:11 +02:00
73a54dfc44
frappy_psi.sea: avoid error on import
...
the previous code raised an error when generalConfig.init() was
not called before importing. defer evaluation of seaconfdir to
the time it is used
+ use updateItem instead of updateEvent to avoid pylint complaint
Change-Id: I0da0891a8d4091102d2a149705f5546e2f6fd187
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34813
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 >
2024-10-17 08:07:11 +02:00
Georg Brandl
025eb5fff5
fix descriptive data
...
- remove unspecified "version" and "interface" properties
- add frappy version to "firmware" property
- keep custom node props with underscores
Change-Id: Ib047e4765a90f2833f9e41af69a665554dd20737
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34792
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-10-17 08:07:11 +02:00
Alexander Zaft
f36af47b98
psi: change open calls in sea
...
Change-Id: I4fe235027df4ea935d84e29895eb280f620afbdf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34665
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-10-17 08:07:11 +02:00
Alexander Zaft
13db0d6bc6
generalConfig, config: use pathlib
...
- switch to pathlib
- represent multiple confdirs as list of Paths internally, not string
with pathsep
Change-Id: I1418e561641e27cd904af0762be056cd66ee1919
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34464
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-10-17 08:07:11 +02:00
Alexander Zaft
fe0aa3d7d5
all: start using pathlib
...
Change-Id: I2b0d6ff8f534382913414fa9b35150d6f697acb4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34463
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-10-17 08:07:11 +02:00
6c2b1ea355
fix meanings and SEA vti mapping
...
- tt:value (VTI temperatures from SEA) should not be sample T
- VTI meaning must be ['temperature_regulation',20]
- stick ts meaning must be ['temperature', 30]
Change-Id: Ib6d662bb27d898958c62c02878d9551161cbc8c2
2024-09-27 15:19:29 +02:00
7ee219ce7a
cfg: fix 'tt' for all SEA cryos: tt:value is now vti temperature
...
before tt:value was the sample temperature
Change-Id: I2070441d3acc93d9ed18bb1ea650bca156443619
2024-09-27 14:57:18 +02:00
ba2b5ac786
frappy.client.interactive: improve order of callbacks
...
the user would expect that updates are shown in the order
they appeared in the SECoP connection.
For this register_callback needs an additional parameter
to suppress initial callback.
Change-Id: Id1d7605d739b02ec799b3768ae2399558969c381
2024-09-23 15:07:03 +02:00
abfb8afdc5
frappy_psi.motorvalve: move doc string to class
...
- this will allow to add other classes if needed
Change-Id: I452c2be19456829796d899891719f5659fac2ba9
2024-09-23 15:05:54 +02:00
7fdb2e7e2f
frappy_psi.trinamic: improve
...
- try several times in case of no success (configurable)
- write default values to the controller
- add limits
Change-Id: I7974d7056bbad48091653378366943ccf3e6f945
2024-09-23 15:04:44 +02:00
dd0cb2e1dc
GUI: allow enums to be plotted
...
numpy.finite() does not accept enums -> convert to float first
Change-Id: Ib740800a7410ada38fb48711d4da676af8b64b17
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34608
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-09-13 09:03:18 +02:00
227f67a4c7
GUI: avoid space needed for closed groups
...
the empty QLabel in widgets for readonly parameters was not hidden
with the group.
Change-Id: I0e5ad49c3b693483a3cabf849e7962925cfcc434
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34607
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-13 09:02:04 +02:00
Alexander Zaft
c92d6471eb
bin: remove make_doc
...
relic from markdown documentation
Change-Id: I8cb1913e6b6d1b8efe77d4d7f982f95e75166707
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34465
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-09-13 09:02:04 +02:00
Jenkins system
991f4781c4
[deb] Release v0.19.10
2024-09-13 09:02:04 +02:00
Georg Brandl
5083db8d92
remove walrus
...
So far, frappy is still supposed to be 3.6 compatible
Change-Id: Ieb56c6500d58cdc1fe2f34b1448b05ba74b0fa6e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34326
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2024-09-13 09:02:04 +02:00
Alexander Zaft
7c54ac735d
debian: let frappy-core replace frappy-demo
...
Fixes : #4888
Change-Id: I32781773cbce9e29381df482b8bd9ba992dcb9e4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34323
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-13 09:02:04 +02:00
Jenkins system
d6b28075d5
[deb] Release v0.19.9
2024-09-13 09:02:04 +02:00
Georg Brandl
d555a58781
debian: fix missing install dir
...
Change-Id: Id865c58b66af71dbb6631e5856f1f8563946fa40
2024-09-13 09:02:04 +02:00
Jenkins system
e6639fbc08
[deb] Release v0.19.8
2024-09-13 09:02:04 +02:00
Georg Brandl
d9f2fb291a
debian: move demo into core
...
Change-Id: I545850163f0fd6e560dcf62a008cb9f1aa544af9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34309
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
2024-09-13 09:02:04 +02:00
Jenkins system
27be8c11fd
[deb] Release v0.19.7
2024-09-13 09:02:04 +02:00
Alexander Zaft
bd84a69537
lib: GeneralConfig fix missing keys logic
...
Change-Id: I814511fff6fbf7c94e30a052bff0712fad9805b5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34306
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-13 09:02:04 +02:00
Jenkins system
a1dd8e2168
[deb] Release v0.19.6
2024-09-13 09:02:04 +02:00
Alexander Zaft
f0f12d6d96
lib: Fix GeneralConfig defaults handling
...
overwriting defaults before init() had no effect, as the values were
replaced there.
Now, only unset defaults are updated, keeping the overrides.
Also fix unconditionally taking the values from environment variables.
Change-Id: Idf1c5e2338403e061d20c11ed9c4803d535eb188
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34304
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-09-13 09:02:04 +02:00
Georg Brandl
96a388eae9
gui: save/restore window geometry
...
Change-Id: I98008fc12479206018416d57ef248a9942b73490
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34297
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-13 09:02:04 +02:00
Georg Brandl
c272a8d619
GUI: allow starting in detailed view by cmdline flag
...
Change-Id: I4248bfee47d807833e02a35ce8dd85fa6b297e77
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34296
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 >
2024-09-13 09:02:04 +02:00
Jens Krüger
f2940d3f23
SINQ/SEA: Fix import error due to None value
...
If the environment variable isn't set a None value is returned. Now an
empty string will be returned
Fixes : #4882
Change-Id: I3e319daebf10e2d8ea3ee00f6094e6896e54f51b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34234
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Reviewed-by: Jens Krueger <jens.krueger@tum.de >
2024-09-13 09:01:01 +02:00
Jenkins system
925df6f4fa
[deb] Release v0.19.5
2024-09-13 09:00:42 +02:00
Alexander Zaft
ff772e578e
pass logger parameter only for mlzlogger
...
The mlzlogger has an extra argument we want to keep using.
To keep compatibility, check if we got the mlzlogger or something else.
Change-Id: I1a4f4e7651370dd71124ab7c3608c6573a585dd9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34292
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 >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-09-13 09:00:42 +02:00
Alexander Zaft
6f465be567
add RemoteLogHandler independent of MainLogger
...
installing a custom logger was not possible, since the RemoteLogHandler
was not installed.
Additionally, search for the RemoteLogHandler recursively upwards, since
not all loggers copy their Hanlders to their children.
Change-Id: If3e19966d9289cacd926648582e9718b7eab279c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34288
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-13 09:00:42 +02:00
Alexander Zaft
1f5bba5575
add missing requirements to setup.py
...
Change-Id: Ie0d3eae3a7aeb1f28983476b00fe012c916051d7
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34287
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-09-13 09:00:42 +02:00
Alexander Zaft
a7fc1e4342
client: fix how to raise error on wrong ident
...
leftover error_map from long ago, turned into direct raising of
HardwareError
Change-Id: I8772e20133502bb0a997d5317a74e2bd16b780c6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34279
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-13 09:00:42 +02:00
Jenkins system
6e1cd30678
[deb] Release v0.19.4
2024-09-13 09:00:41 +02:00
Georg Brandl
acf9a03aa4
actually exclude cfg-editor
...
Change-Id: I1a31fd96eb8962cff92cda349201ebff4a0dddbc
2024-09-13 09:00:41 +02:00
Jenkins system
79827baf2a
[deb] Release v0.19.3
2024-09-13 09:00:41 +02:00
Enrico Faulhaber
12d7b5dae9
remove cfg_editor for now
...
as it was not functional...
fixes : #4881
related: #4882
Change-Id: Ic8c5ee06fcdd48b8b0562b5b1275296d2b155f06
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34226
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Jens Krueger <jens.krueger@tum.de >
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-09-13 09:00:41 +02:00
Jens Krüger
318b3ad412
Update copyright year
...
Change-Id: I7fe65e46639c2d8948fa93303ee9b14393e8bfca
2024-09-13 08:59:40 +02:00
Alexander Zaft
4305d84ef8
mlz seop: add pylint
...
Change-Id: I096dff796c88bf1b23778aa57c73f9aa77712372
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34127
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-13 08:59:26 +02:00
Alexander Zaft
177f49ca3f
mlz: fix delayed import of he3cell
...
Change-Id: Ia15693a11f9d1526b4a50be4adbad19640eafe93
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34126
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-13 08:59:26 +02:00
fb5e468048
frappy_psi.sea: use raise from
...
this was complained by Jenkins after merging (1)
Change-Id: I9e4eb57004d218021978d6e9e06e1cbd42ec5e9c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34024
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-09-13 08:58:53 +02:00
Oksana Shliakhtun
6c01a1e48a
Draft for the Keythley Pulse System driver
...
Change-Id: Idd6f86acbaac178ab8031625b36ded1351de6a34
2024-08-27 15:16:27 +02:00
Oksana Shliakhtun
96412cb480
Comments
...
Change-Id: Ie7fe10f704aec62c19cae0bab16d43d55d911a36
2024-08-27 15:16:27 +02:00
Oksana Shliakhtun
807afba53b
Changed temperature range
...
Change-Id: Ib2a0bc59b191d33e65420375385d8807754193a9
2024-08-27 15:16:11 +02:00
Oksana Shliakhtun
97032193bf
Changed temperatures
...
Change-Id: I1411e425bd911b73cfcb459de50e7eea2cd15c51
2024-08-27 15:15:48 +02:00
Oksana Shliakhtun
a3c1399854
Driver with comments
...
Change-Id: Ic2d35960de6b33e4d61ad1920d2416e2d5ed1ded
2024-08-27 15:15:39 +02:00
