Alexander Zaft
c550721e2d
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-09-19 13:34:14 +02:00
Alexander Zaft
90d49355fa
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-09-19 13:32:15 +02:00
116ad54ac1
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:02:45 +02:00
8660d83a67
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-10 15:21:37 +02:00
Alexander Zaft
235e0f5820
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-08-27 11:12:42 +02:00
Jenkins system
a7b763713b
[deb] Release v0.19.10
2024-08-07 17:00:07 +02:00
Georg Brandl
4c77b0b923
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-08-07 15:32:12 +02:00
Alexander Zaft
3cd63119a3
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-08-07 13:25:03 +02:00
Jenkins system
19f6e8ed43
[deb] Release v0.19.9
2024-08-06 16:02:50 +02:00
Georg Brandl
6e56c19b77
debian: fix missing install dir
...
Change-Id: Id865c58b66af71dbb6631e5856f1f8563946fa40
2024-08-06 16:02:42 +02:00
Jenkins system
359fb4e69b
[deb] Release v0.19.8
2024-08-06 15:58:20 +02:00
Georg Brandl
6479134e6a
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-08-06 15:55:01 +02:00
Jenkins system
63bb34cf51
[deb] Release v0.19.7
2024-08-06 15:04:07 +02:00
Alexander Zaft
dacae94408
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-08-06 14:59:27 +02:00
Jenkins system
f9f0eda937
[deb] Release v0.19.6
2024-08-06 13:56:51 +02:00
Alexander Zaft
768d758efa
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-08-06 13:56:25 +02:00
Georg Brandl
1b40b77fd4
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-08-05 17:22:56 +02:00
Georg Brandl
54782bdbad
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-08-05 10:52:33 +02:00
Jens Krüger
fb9e713043
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-08-05 10:12:38 +02:00
Jenkins system
bcfb4ae474
[deb] Release v0.19.5
2024-08-05 09:30:53 +02:00
Alexander Zaft
e30d2544d2
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-08-05 09:29:50 +02:00
Alexander Zaft
48de238dbc
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-08-05 09:29:45 +02:00
Alexander Zaft
1d71445440
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-08-02 09:36:57 +02:00
Alexander Zaft
9ed1f29e68
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-08-01 09:17:33 +02:00
Jenkins system
ba1d4c3a9e
[deb] Release v0.19.4
2024-07-26 11:46:10 +02:00
Georg Brandl
c5bb0c37b1
actually exclude cfg-editor
...
Change-Id: I1a31fd96eb8962cff92cda349201ebff4a0dddbc
2024-07-26 11:46:02 +02:00
Jenkins system
1d49577f9a
[deb] Release v0.19.3
2024-07-26 08:36:44 +02:00
Enrico Faulhaber
f055ae20c2
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-07-26 08:36:16 +02:00
Jens Krüger
bb5459243c
Update copyright year
...
Change-Id: I7fe65e46639c2d8948fa93303ee9b14393e8bfca
2024-07-24 08:35:14 +02:00
Alexander Zaft
c4ad2ec83d
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-07-12 15:24:54 +02:00
Alexander Zaft
abee1cc463
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-07-12 15:16:23 +02:00
e0e90c4000
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-06-24 17:03:47 +02:00
81002c2568
frappy_psi.sea: use ReadFailedError
...
change error class on reading parameters in SEA from HardwareError
to ReadFailed. This is in most cases more appropriate.
TODO: find errors in SEA that should be should be HardwareErrors
and a mechanism to indicate this
+ for errors related to disabled modules use the DISABLED status
Change-Id: I0342a34185a66dcf874c6ca034b7cefc98bf9c8a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34022
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-24 13:40:33 +02:00
2598e94cb7
better behaviour on startup in case of errors
...
- fix a bug then TcpServer can not start dye to address in use
- report errors when restarting interfaces
- increase timeout. the timeout for waiting all interfaces
starting up must be higher than a potential successful
startup of TcpServer, which is currently ~ 10 sec
(might be reduced, but at both places)
Change-Id: I88b967c4baff79fdf94f4c849dd713d2cba6fabc
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33985
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 >
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
2024-06-19 17:02:21 +02:00
67611d6d23
frappy_psi.extparams.StructParam: fix doc + simplify
...
- the doc string contained wrong, obsolete information
+ simplify: remove customizeable mapping member name -> param name
Change-Id: I0ffdcb336f45001d45f68238b56e1e257d98dd3d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33993
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-19 17:02:06 +02:00
Jenkins system
3c7c883538
[deb] Release v0.19.2
2024-06-18 15:21:43 +02:00
Enrico Faulhaber
22d016bd59
frappy_mlz/entangle: fix missing status enum
...
finally!
Change-Id: I5be4ded7c8ee87a09be44ba474e26cd023c917c6
2024-06-18 15:20:13 +02:00
185b47a471
frappy_psi.triton: fix heater output issue
...
when output_module is not HeaterOutputWith range, the heater limit
can not be changed
Change-Id: If25a609e9f9667dc111cb220024388a51df993ec
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33913
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-12 11:26:58 +02:00
7dc4cf7029
frappy_psi.sea: various improvments
...
- always open asynio and syncio connections (conenctions for
update and command)
- better synchronization when reconnecting using threading.Event
- nicer error messages
Change-Id: Ia435c3ccfa2732be4aa9f24a3b6e8484fab715a3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33909
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-12 10:54:00 +02:00
924a9a2c7f
frappy_psi.triton: bug fixes
...
- fix channel numbers
- make sure some channels are selected
Change-Id: I11c553805ed5ee6235e54ce56a5ea68160d1d212
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33911
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
2024-06-12 10:53:41 +02:00
36dd7598cc
frappy_psi.picontrol: software control loop
...
example usage: use a temperature controller without changing
the calibration setting:
reading the raw sensor, calibrate by software and use 'manual'
heater output
Change-Id: I3dbcf37e7726b48a0516d7aa30758be52b80fe58
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33910
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-12 10:53:18 +02:00
0641bc22c3
frappy_psi.ah2700: auto create loss module with Pinata
...
the loss angle is a separate quantity, which is preferred to
be an extra module. create this automatically.
Change-Id: I97f6be48f3411d8143f2ff85c2c61711fc71e8d6
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33908
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-12 10:52:50 +02:00
Alexander Zaft
3d27a805d4
add option for delayed imports
...
will make setup checking easier, although it does not work for all cases
(from imports for example)
Change-Id: I2e5cf9b427a6f8e6f603d9662cdb9700d5f9ad9a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33893
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 >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-06-12 10:33:31 +02:00
fa007e4f1c
bug fix in frappy_psi.convergence
...
+ various doc improvements
Change-Id: I8ce2a1f006a5e4870285ce1f6015510e21d01a13
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33906
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
2024-06-11 17:56:51 +02:00
e74192d45e
HasControlledBy: update target without switching to self control
...
when a HeaterOutput module is used e.g. from a software loop,
a method is needed to update the output without switching to
self-controlled
Change-Id: I9c83b4e172e14812a405e836757491622ff5f949
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33903
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch >
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
2024-06-11 16:08:44 +02:00
516e0c7a59
frappy.lib.asynconn: handle ConnectionResetError nicely
...
Change-Id: Icba24ffb82369aa78e431d12260f4f3cc795e511
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33902
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-06-11 16:08:34 +02:00
l_samenv
a53eebe2f3
fix missing update after error on parameter
...
the main error was a suppressed update when the value does not
change, but the readerror gets None
this error was the reason for strange behaviour in frappy.proxy
while finding the cause, other improvements were done:
- nodeStateChange: add 'activating' to the possible online states
- improve status handling in proxy
Change-Id: I2a1873065ab051bdba2200f50e6ad09ae55e168e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33901
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-06-11 16:08:25 +02:00
Jenkins system
91d50ae703
[deb] Release v0.19.1
2024-06-07 16:50:34 +02:00
Alexander Zaft
878f4774e4
mlz: derive Digitaloutput from Drivable
...
as the underlying entangle *DigitalOutput may be BUSY and frappy.Writable
disallows this.
Change-Id: I6e4861c6d014f59ad4cc2355a438130173bf6569
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33849
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de >
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de >
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de >
2024-06-07 16:48:14 +02:00
Alexander Zaft
d77a7da606
datatypes: add more detail to error messages
...
the error messages for tuple and array swallow all details useful for
debugging. add the original exception for some context
Change-Id: I8e1036bfab10c09d5f9c8af05ac3306af89f54c4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33850
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de >
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-06-05 14:02:25 +02:00
