linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
508 Commits 20 Branches 1 Tag
bcf57f53c3eb8e0c3ef4cec2a1d173fb79155010
Commit Graph

65 Commits

Author SHA1 Message Date
Markus Zolliker
bcf57f53c3 fix access to sea config dir 
- removed unused property json_path
- do not take the first directory in config path, but the first
  directory with a sea subdirectory

Change-Id: I4f0d72936ca616134c38568d88c57a33a3397ec6
 2021-03-11 15:53:57 +01:00
Markus Zolliker
1ca35cf8e9 improved softcal 
- better error handling
- bug fix
Change-Id: I43bdd4aa35723f43f9e4baf2723af812f04689d3

Change-Id: I5990c75a7a8153e95abee9548475783ee893bd08
 2021-03-08 10:25:39 +01:00
Markus Zolliker
7f22a270e6 make softcal more tolerant reading .340 files 
accept tab instead of space in 'Data Format' header keyword

Change-Id: I77e5500da5eaed6fd1097723533bc86207fa73d8
 2021-03-08 10:21:23 +01:00
l_samenv
e4748ef9c9 do not export pollintervals in ppms driver 2021-03-03 10:16:52 +01:00
Markus Zolliker
b4bb172ada Merge branch 'wip' 
Change-Id: I3ba389775ce9b02269ca9c20a42ec1bddf6c5d21
 2021-03-03 09:46:20 +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
12b0549cc0 merged master with work 
Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59
 2021-03-03 09:00:45 +01:00
l_samenv
f861701fc2 update FG and SR drivers 
these drivers should now include the last changes before
the syntax change. To be tested ...
 2021-03-01 11:24:30 +01:00
Markus Zolliker
9071a5bcf7 fix inheritance order 
+ hide pollperiod on PPMS Modules

Change-Id: I77ad5502884360bf6babfd226de0675ee06a6196
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25054
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-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
07b758c3dd removed old style syntax 
- removed secop/metaclass.py
- moved code from ModuleMeta to modules.HasAccessibles.__init_subclass__
- reworked properties:
  assignment obj.property = value now always allowed
- reworked Parameters and Command to be true descriptors
- Command must now be solely used as decorator
- renamed 'usercommand' to 'Command'
- command methods no longer start with 'do_'
- reworked mechanism to determine accessible order:
  the attribute paramOrder, if given, determines order of accessibles
+ fixed some issues makeing the IDE more happy
+ simplified code for StatusType and added a test for it

Change-Id: I8045cf38ee6f4d4862428272df0b12a7c8abaca7
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25049
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-02-26 17:27:13 +01:00
Markus Zolliker
f9a2152883 enhance documentation 
- flatten hierarchy (some links do not work when using folders)
- add a tutorial for programming a simple driver
- clean description using inspect.cleandoc
+ fix a bug with 'unit' pseudo property in a Parameter used as override

Change-Id: I31ddba5d516d1ee5e785e28fbd79fca44ed23f5e
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/25000
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
9afcc49430 improve softcal 
- bugfix: stop searching for file on the first match
- allow to ignore the sign on input by abs (bool) parameter

Change-Id: I0e5544d7645f124d4c4ac720174b0f5bde7e71a6
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/24928
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
7895470301 main module of LS370 is now drivable 
The main value of main module is the selected channel, it is 0
when pausing during scanning, and the status is busy.

+ cosmetics to make IDE more happy

Change-Id: I11d8f08ea67d25fb00f7492080b4a55efc124bfb
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/24927
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-02-26 17:27:13 +01:00
l_samenv
3cc8db881e fixed ls370 issue when dwell time is too short 2021-02-26 16:13:22 +01:00
Markus Zolliker
d6cf1f7629 added ccu4 and mercury drivers 
Change-Id: I566016e9972a33b94eff5025523206e9806c4b5c
 2021-02-26 15:17:58 +01:00
Markus Zolliker
41baf5805f migrated secop_psi drivers to new syntax 
- includes all changes up to 'fix inheritance order' from git_mlz
  6a32ecf342

Change-Id: Ie3ceee3dbd0a9284b47b1d5b5dbe262eebe8f283
 2021-02-25 14:01:54 +01:00
Markus Zolliker
bc5edec06f enhance documentation 
- flatten hierarchy (some links do not work when using folders)
+ fix a bug with the redorder flag in Override
+ allow removal of parameters
+ clean description using inspect.cleandoc

Change-Id: I3dde4f4cb29c46e8a21014f1fad7aa3ad610a1bf
 2021-01-25 15:12:47 +01:00
Markus Zolliker
fbb0d10c55 fixed worst bugs in FG Lecryo driver 
Change-Id: Iab6b7e0f0838a42f1a4f4b484745cc7dd7089c6b
 2021-01-21 08:40:16 +01:00
Markus Zolliker
bc33933a1a update doc 
- add properties, parameters and commands to the doc string autoatically
- change names to "Frappy"
- started tutorial
- changed doc structure slightly

Change-Id: I87bef91384d138c738d12ddcf3a1de7f758a0973
 2021-01-19 17:20:53 +01:00
l_samenv
16834f8802 fix a bug softcal 
- stop searching for files on the first match
 2020-12-04 13:33:54 +01:00
l_samenv
d9650d7fc7 improve drivers for PPMS auxiliary equipment 2020-12-04 13:33:08 +01:00
local SE user
cab2bb85ba [wip] next version of FG 2020-11-10 11:55:09 +01:00
l_samenv
2fb05b37f8 [WIP] driver for FG_Lecroy_3000 
not yet working
 2020-11-10 08:09:39 +01:00
l_samenv
ad2a79c312 SR_7270: autorange is an enum 
- autorange may be off, soft or hard
 2020-11-10 08:00:33 +01:00
l_samenv
82b4af4faa main module of LS370 is now drivable 
- the main value is the channel
- it is busy when pausing during scanning
+ allow softcal to ignore the sign
 2020-11-10 07:57:48 +01:00
Markus Zolliker
cf24bbc3c3 improved doc on softcal and Module.registerCallback 
Change-Id: I12b1f7a2d29435d989fb9953f72bea181e6cb4f7
 2020-10-28 09:59:40 +01:00
Markus Zolliker
b544d2af98 Merge branch 'master' into wip 2020-10-28 07:55:17 +01:00
l_samenv
5db1acb07c improvements on SR_7270 driver 2020-10-20 14:38:45 +02:00
l_samenv
880327c544 main ls370 module is now drivable 
the value is the current channel, when the target (=channel) is changed,
the value changes to 0, until the switching has finished, including pause time
 2020-10-20 14:17:24 +02:00
l_samenv
587b170f6a update SR_7270 2020-09-10 15:47:04 +02:00
l_samenv
1c42859466 newset version of senis 2020-09-10 10:43:34 +02:00
l_samenv
1f832388d7 Merge branch 'wip' of git.psi.ch:sinqdev/frappy into wip 2020-09-08 13:37:01 +02:00
l_samenv
5f9344109d improve sea client 2020-09-08 13:36:11 +02:00
Markus Zolliker
047f3a7606 add a lot of current stuff 
this is not (yet) in the frm2 repo

Change-Id: Ia5b2996803c3dbb15b85ab1bc3a24717ac6297fb
 2020-08-13 11:33:14 +02:00
Markus Zolliker
7f7c1a85ab 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-08-13 11:33:14 +02:00
Markus Zolliker
0641968715 add a lot of current stuff 
this is not (yet) in the frm2 repo

Change-Id: Ia5b2996803c3dbb15b85ab1bc3a24717ac6297fb
 2020-07-29 14:57:50 +02: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
ab00c45db0 improvements on PPMS and LS370 
- improved machanism for 10 K waiting
- fixed an issue with auto range

Change-Id: Ia6454141917893f0e5c6c4351df3a864942bb629
 2020-07-07 15:08:28 +02:00
Markus Zolliker
c16adf38cd HasIodev bug fix 
Change-Id: I2be3b477f7d6ca74f2fefb5efc1bd134ac8d047e
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23124
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-05-20 16:51:04 +02:00
Markus Zolliker
31ae0a88b4 ppms: improve status and temperature 
- treat unknown status values similar to status 0
- wait at 10 K when cooling below
- better error message

Change-Id: Ic07826e31f36abc72ee5d72da001fb1f3d2fe8aa
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23121
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-05-20 16:17:48 +02:00
Markus Zolliker
5c33cbf7a5 introduce update callbacks 
includes a use case:
- a software calibration, to be applied to any Readable.
- calibration could be changed on the fly

+ refactored a little bit update events mechanism

Change-Id: Ifa340770caa9eb2185fe7e912c51bd9ddb411ece
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23093
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-05-15 15:49:22 +02:00
Markus Zolliker
da7a027949 make datatypes immutable 
in order to prevent modifying parameters without automatically
trigger updates, all datatypes must be immutable.

TupleOf and ArrayOf: change from list to tuple
StructOf: use ImmutableDict

most existing code should work properly, the only thing to consider are
equality comparisons with lists, which will result to False all the time

the changes in secop_psi/ppms.py (using tuples instead of lists for status values)
are not really necessary, but lead to less confusing code

Change-Id: I181f412b5cd55af296b2e5120af82449beb03f54
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22972
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-16 08:08:45 +02:00
Markus Zolliker
d73d4b8788 improve ls370res driver 
use limited float on some parameters

Change-Id: Ic1ec823344a36a1cbcf551fadc8f87073e7b3dac
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22889
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-04-07 14:16:40 +02:00
Enrico Faulhaber
7ba5f6f8ed introduce secop.core for easy imports 
Change-Id: I559d537ba480e1c20f8e11fb259da6e17da53059
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22892
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-04-07 12:20:33 +02:00
Markus Zolliker
434ef4a423 move getParameter method from ProxyClient to SecopClient 
+ remove unneccessary x mode for some py files

Change-Id: Iaca31fc35ef57805e68e0404c1c7d3240a15f11a
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22571
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-03-02 17:13:31 +01:00
Markus Zolliker
ed12e2ed93 adjust mechanism of write function with iohandler 
if a write_<parameter> function is defined and <parameter> has an
iohandler, the handlers write function is not called automatically.
It has to be called explicitly in the write_<param> function, if
needed.

reasons:
- the previous logic when a wrapped write function is already present, and a
  handler is defined on the specialized class, did not work, and is not
  easy to solve properly
- it is probably anyway better to call the handlers write function explicitly
  instead of automatically depending on the return value

Change-Id: I04f0849b6cc3fb9979c0f5ac8245a6ab4bf23072
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22565
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-03-02 11:28:42 +01:00
Markus Zolliker
2d98fe8812 allow to set exported properties in code 
Actually, only property values set in the configuration can
be exported, as values equal to the default are not exported.
For this, the mechanism of overwriting properties by class attributes
has to be modified.

Change-Id: I4388d1fbb36393e863556fbbc8df800dd4800c87
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22161
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-01-15 13:24:11 +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
d442c5b6bf added missing write methods to AH2700 driver 
forgot to put the write_* methods in the first change

Change-Id: I4a68d259f6f8f9674b72d88f184efe2b1b15819a
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22099
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2020-01-08 14:44:14 +01:00