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

38 Commits

Author SHA1 Message Date
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
tasp
f9db90d89b update secop_psi/sea.py 
fixes after serveral changes in frappy
 2022-04-29 16:30:19 +02:00
Markus Zolliker
9152ea1d26 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-04-08 15:36:23 +02:00
Markus Zolliker
bd246c5ca7 result from merge with gerrit 
secop subdir only

Change-Id: I65ab7049719b374ae3ec0259483e7e7d16aafcd1
 2022-03-07 17:49:08 +01:00
Markus Zolliker
acb3bdad6a varios fixes at psi repo, as of 2022-02-01 
Change-Id: I8cdc849126d52ef0f2f27a0faf661830aac6f874
 2022-02-02 09:57:30 +01:00
Markus Zolliker
cbb005d942 show traceback of first error instead of last one 
Change-Id: Iee418dcfb1d81a16112eed57b03c86242c2128b4
 2021-10-06 08:34:56 +02:00
Markus Zolliker
48230334af fix inheritance problem with mixin 
- a mixin should not inherit from module then it has Parameters
- Parameters in mixins must be complete, not just overrides
- check precedence of read_<param> or handler

Change-Id: I72d9355a1982770d1a99d9552a20330103c97edb
 2021-03-18 13:32:54 +01:00
Markus Zolliker
4fd9c17bcb move historywriter to secop_psi 
as historywriter currently could be used at psi only
secop_psi is a better place for it

+ add comment about a general config file

Change-Id: I9b0e74d3da83ac485bd4bcc13475695c3140822c
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25077
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>
 2021-03-03 09:06:14 +01:00
Markus Zolliker
1588703f99 try to follow PEP8 
- fixed most important code after checking with flake8
- ignored code which has to be reworked or removed
+ mark unused code with 'TODO: remove ...'

Change-Id: Ic45e541049e391e2853d29cd64bb0963bd9a2125
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25053
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2021-02-26 17:27:13 +01:00
Markus Zolliker
fe041bac0a after running isort 
Change-Id: I6d7dbb8dee9480fc9242529089a1b40f17f068e7
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25052
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2021-02-26 17:27:13 +01:00
Markus Zolliker
aa4c8f1f04 improvements on PPMS and LS370 
- PPMS: improved machanism for 10 K waiting
- LS370: fixed an issue with auto range
+ LS370: show test for all status bits

Change-Id: Ia6454141917893f0e5c6c4351df3a864942bb629
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23495
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-07-29 13:50:21 +02:00
Markus Zolliker
f3ecd912da customizable general config 
evnironment variables SECOP_<DIRNAME> may overwrite configured
directories logdir, piddir and confdir

Change-Id: Idc13339c36c15853e09d1dd20f04c4a622436fbe
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22974
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-04-17 07:44:18 +02:00
Markus Zolliker
a5ad527378 fix again configuration paths on windows 
the executable for python might also be called pythonw.exe,
-> adjust the guess

Change-Id: Ie2e7adc6d55f82ad4243761645da0e8e6ec8cc40
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22549
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-02-27 14:44:17 +01:00
Markus Zolliker
685f22330a fix configured path on windows 
exclude python.exe from special rule

Change-Id: Ia7dfe17ffb3a44dcb642d7a750c92865d7a1c6c3
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22435
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-02-07 17:25:26 +01:00
cermak
8466a159fe Compatibility with Python 3.4 
This change allows compilation under python 3.4. In addition:
 - spec file added for pyinstaller with required hidden imports
 - changed default pathes for compiled exe file
 - added requirements for ppms under windows compilation

Change-Id: I63d805a984d6a2c045df527303f46c8440994aad
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22170
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Petr Cermak <cermak@mag.mff.cuni.cz>
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Tested-by: Petr Cermak <cermak@mag.mff.cuni.cz>
 2020-01-15 08:15:35 +01:00
Markus Zolliker
f0a3306f9c changed/fixed behaviour of stop commands in PPMS 
- make sure new target created by the stop command is between
  old and new target
- fixed bad behaviour of level reading

Change-Id: I484c0902c694c0edb81e2d9238985c05f92e04f4
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22100
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-01-09 14:03:45 +01:00
Markus Zolliker
230624cdeb fix config path 
config path must be 'cfg', not 'etc'

Change-Id: I835091f16ced3896126dcb650fc37155b15c95c2
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21482
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2019-10-30 09:00:54 +01:00
Markus Zolliker
c1164568ae further fixes of py3 issues 
complaints by pylint are mainly related to
- remove object from base list in class definitions
- unnecessary else/elif after return/raise

Change-Id: I13d15449149cc8bba0562338d0c9c42e97163bdf
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21325
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2019-09-26 14:15:48 +02:00
Enrico Faulhaber
70a9c42a7a Remove py2 support 
Change-Id: Ieeaeb3b8efcae004e94aea6c1d2703c9782a8650
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21320
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2019-09-26 10:32:01 +02:00
Enrico Faulhaber
9b33e07260 Provide systemd files 
+ move example cfg from etc/ to cfg/

Change-Id: I437b3e2aaca55539ff110f5a46e411b34e0a0b9c
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21319
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2019-09-25 15:32:48 +02:00
Enrico Faulhaber
6acc82d808 lib: fix lazy_property descriptor 
see also: https://forge.frm2.tum.de/review/c/frm2/nicos/nicos-core/+/21285

Change-Id: I5ea4c5bfbad7f871dd819b0cf4fdd479c79c47a2
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21288
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2019-09-24 09:31:58 +02:00
Seger Sandra
e1f017d678 add cfg-editor 
Change-Id: I68b8ba9311ec0487d7a2676095a7170a2447b3d0
Reviewed-on: https://forge.frm2.tum.de/review/20206
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2019-07-23 14:23:26 +02:00
Enrico Faulhaber
a255cfaa55 isort result 
Change-Id: I137d9a6b4e2322f8df0506f9e8f751a4743aafd0
Reviewed-on: https://forge.frm2.tum.de/review/20218
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2019-03-26 11:05:34 +01:00
Enrico Faulhaber
9824b9216d various unicode fixes 
Change-Id: Ia3a83b678a5084fd1d43b8cf513b296fdbde3d91
Reviewed-on: https://forge.frm2.tum.de/review/19198
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-10-15 14:42:21 +02:00
Enrico Faulhaber
574a66c65b rework EnumType to use better Enum's 
unfortunately IntEnum can't be bent like we would need it (extensible).
So we had to write our own....

The members of the Enum still behave like ints, but also have
.name and .value attributes, should they be needed.

needed adoptions to correctly use (and test) the EnumType are included.

Change-Id: Ie019d2f449a244c4fab00554b6c6daaac8948b59
Reviewed-on: https://forge.frm2.tum.de/review/17843
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-06-07 17:57:46 +02:00
Enrico Faulhaber
3b802e67c8 improve Py2/3 compat 
Change-Id: I1dfdcb88a492401851d5157c734cd708496bf004
Reviewed-on: https://forge.frm2.tum.de/review/17734
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2018-04-17 17:34:24 +02:00
Enrico Faulhaber
96ac437fd3 fix transport and display of node-properties 
Change-Id: I35a3021768e386a5ce922c8e24128d0bc3a039be
 2017-09-12 16:10:22 +02:00
Alexander Lenz
a0a75af601 Fix wrong paths. 
Change-Id: I7321f887a9c2a472c27cca72157368805fc5fcb8
 2017-09-07 11:20:24 +02:00
Alexander Lenz
449bdcd48b Fix path detection. 
Change-Id: If76969e6c753596fff885fdb021ba53b1537c945
 2017-09-07 11:08:10 +02:00
Enrico Faulhaber
2bb96bea70 provide setup for MLZ_Amagnet to be used @PSI soon 
Also implement lots of fixes and improvements.

fixes: #3381

Change-Id: Ibe6664da00756ae5813b90f190295045808b2ff0
 2017-07-27 11:21:05 +02:00
Enrico Faulhaber
29ee07c5b3 several improvements and bugfixes 
+ rework GUI
  - include a combobox for selection of visibility
  - include a checkbox wether validation should be done in the client
  - remove unused lineEdit
+ improve datatypes
+ improve tests for new descriptive data
+ metaclasse: fix overlooked read_* or write_* func's
+ improve polling
+ Introduce new ErrorClasses
+ dispatcher: use new features of datatypes + PARAMS
+ improve lib
+ autopep8
+ first working version of MLZ_entangle integration
+ split specific stuff into it's own package (MLZ,demo,ess)

Change-Id: I8ac3ce871b28f44afecbba6332ca741095426712
 2017-07-19 11:03:29 +02:00
Enrico Faulhaber
8a63a6c63f Switch descriptive data to new format 
Change-Id: Ic8afe976564824d14394ed6a1b4b36df226648df
 2017-07-10 18:11:14 +02:00
Enrico Faulhaber
bc3253a01a replace validators with datatypes 
Change-Id: I446c4e14e24afa3f65e79c8b6e07eec3271532b0
 2017-07-03 18:13:09 +02:00
Enrico Faulhaber
6ec30e38e8 polishing for a demo 
+ adopting additional requests

Change-Id: If5ca29b5d247f1bc429ca101b0081b1d14f6e6f1
 2017-01-26 10:13:12 +01:00
Alexander Lenz
d442da0789 Stub debug client gui. 
Change-Id: Ib422c66bc36245e1fc3c450765d7555da5c8dda0
 2017-01-19 10:04:16 +01:00
Enrico Faulhaber
78bb3b5f96 Pep8 improvements + cleanup 
Change-Id: I9052e703b58e93b639c027521b47f693ae853f6e
 2016-12-16 14:21:42 +01:00
Enrico Faulhaber
7320ac1538 Provide basic client Object 
also improve the describing data and core params

Change-Id: I645444f2a618fdfd40a729e1007c58def24d5ffb
 2016-12-15 14:24:25 +01:00
Enrico Faulhaber
b6af55c358 reworking messages 
1) start 'bin/secop-server test'
2) connect to localhost port 10767
3) enter help<enter>
4) enjoy

Change-Id: I488d5f9cdca8c91c583691ab23f541a4a8759f4e
 2016-12-08 13:46:32 +01:00