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

886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Zolliker
84d0d44f38 phytron with HasStates 
test version

Change-Id: Ifbaa35421a64faad32c87bbcf758c236f900cd0b
 2023-05-15 08:33:14 +02:00
l_samenv
fa9525fd4c Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2023-05-11 10:42:38 +02:00
l_samenv
087036922a move more code from bin/frappy-cli to frappy/client/interactive.py 2023-05-11 10:42:10 +02:00
l_samenv
1ce43a567b fixes in sea cfg files 
- json_file must be a string, not a list
- rel_path is no longer to be converted to a list
 2023-05-10 16:36:32 +02:00
Markus Zolliker
c46947afd4 update phytron driver 
offset as storage only (after current draft specs)

Change-Id: I1a005f149a8bd562124e2d40e49416957f66e851
 2023-05-10 14:32:26 +02:00
Markus Zolliker
3099c813d1 add unit=s to pollinterval 
Change-Id: I6a28fecd4b0d650042f2f031a1b64b801fc2885e
 2023-05-10 14:32:11 +02:00
Markus Zolliker
8039351395 mercury, ips, sea, triton, convergence 
after gerrit

Change-Id: Iff14047ecc476589aef10c96fae9970133b8bd14
 2023-05-09 14:57:34 +02:00
Markus Zolliker
750b5a7794 add empty description to Mod() for Sea classes 
Change-Id: I3890782b4e08291f73db0bfc4671c6cbc14f05d6
 2023-05-09 08:19:03 +02:00
Markus Zolliker
a9fe8577c3 improve mercury driver 
less fancy but more readable commands

Change-Id: Ifcc6a03199167179d984235c9b1bc7e14c60b51b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31008
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-05 13:30:29 +02:00
l_samenv
74729872a8 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2023-05-05 13:25:10 +02:00
Markus Zolliker
6b78e69dbe add HasOffset feature 
+ remove all other unused features

Change-Id: Idff48bdabf51e7fa23547eac761f11320c41861c
 2023-05-05 13:23:14 +02:00
Markus Zolliker
3b95013b69 improve and fix errors with parameter limits 
- in order to work properly, readonly=True in limit parameters
  has to be set before creating the write_* method
- more explicit: Use e.g. target_max=Limit()
- fix an error in the loop over the base classes when creating
  the check_* method
- more concise error message when a limit is violated
+ fix an error in playground when using persistent parameters

Change-Id: Ibd557b55d6c0d9a2612cda4460b16e3c70e1bc9e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31017
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-05 13:21:37 +02:00
Markus Zolliker
85166344d2 improve interactive client 
- remove irrelevant traceback on remote errors
- add run() function to execute scripts
- when started with bin/frappy-cli, use separate namespace

Change-Id: Ic808a76fa76ecd8d814d52b15a6d7d2203c6a2f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30957
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-05 13:20:54 +02:00
Markus Zolliker
ca6b7a65c0 improve mercury temperature loop 
- remove appearance of Done
- add auto flow
- try up to 3 times in 'change' method if read back does not match

Change-Id: I98928307bda87190d34aed663023b157311d4495
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30981
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-05 13:20:38 +02:00
Markus Zolliker
f528cc4808 fixes on HasConvergence and HasOutputModule 
- HasConvergence must inherit from HasStates
- control_active should have a default

Change-Id: Ic8b430003fdb746bf76782b74fa04e43c700c2e2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31023
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-05 13:18:51 +02:00
Markus Zolliker
3314241631 [WIP] phytron improvements 
- Limits
- offset
- power cycle behaviour

Change-Id: Id2f717c362cd7e1e37f180c8130b0e086e724389
 2023-05-05 13:16:41 +02:00
Markus Zolliker
3fcd72b189 merge manually with mlz repo 
as of 2023-05-04

Change-Id: I5926617c454844927799e20a489db20d538db100
 2023-05-04 16:34:09 +02:00
l_samenv
5bc0b94c6d fix mb11 slot for updated mercury driver 2023-05-04 15:25:05 +02:00
Markus Zolliker
bbe70fb3cb add missing files from secop_psi 
- all of them have to be checked!

Change-Id: I89d55ca683d0b2710222f14c2c3cd42f8fbf3a1f
 2023-05-03 11:24:47 +02:00
Markus Zolliker
31be98c62e MB11: increase persistent_limit to 11.1 
Change-Id: I6849877212a8fc2ac16ef80d727581ae7f6c5e94
 2023-05-02 16:49:35 +02:00
amor
94070121c7 converted smamor 2023-05-02 16:43:09 +02:00
zebra
1961f91567 add switching_sensor 2023-05-02 16:39:34 +02:00
zebra
e38139089f add hvolt_long and varioxstick (zebra) 2023-05-02 16:38:27 +02:00
zebra
e2c51b3dd1 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-05-02 16:35:50 +02:00
zebra
b77c222b72 add setsamp to ma02.config.json 2023-05-02 16:34:23 +02:00
sans
b55af7b20b add ma7two, oventwo and ovenstick (sans) 2023-05-02 16:32:04 +02:00
hrpt
72add69b65 add rt and sch (from hrpt) 2023-05-02 16:19:07 +02:00
dmc
1a44c2d513 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-05-02 16:09:16 +02:00
camea
0fb10a0a10 converted cfg files from camea 2023-05-02 16:07:38 +02:00
Markus Zolliker
748ea1400a improve interactive client 
- remove irrelevant traceback on remote errors
- add run() function to execute scripts
- when started with bin/frappy-cli, use separate namespace

Change-Id: Ic808a76fa76ecd8d814d52b15a6d7d2203c6a2f3
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30957
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-02 15:54:32 +02:00
Markus Zolliker
5784aa0f5d improve mercury temperature loop 
- remove appearance of Done
- add auto flow
- try up to 3 times in 'change' method if read back does not match

Change-Id: I98928307bda87190d34aed663023b157311d4495
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30981
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-02 15:54:14 +02:00
Markus Zolliker
6c02f37bbb issues with StructOf 
- depending whether client or server side, handling of optional is different
- fix issues when struct is used as keyworded command arguments

Change-Id: I72b347b1a96ee3bce1f67dace4862c313c12c7a9
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30972
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-02 15:52:51 +02:00
Markus Zolliker
d6d564f4aa a playground for debugging drivers 
playground for trying out drivers by calling methods read_*
and write_* directly without starting a real SECoP server

Change-Id: Ia7d2366920d29794a4eda5d7bfb2b62d4930eb65
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30944
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-05-02 15:52:19 +02:00
Markus Zolliker
da15df076a fetched mlz version 
- before some chamges in the gerrit pipline

Change-Id: I33eb2d75f83345a7039d0fb709e66defefb1c3e0
 2023-05-02 15:25:11 +02:00
dmc
9fc6b6c0fd add ill3 and ori1 stick 2023-05-02 09:31:09 +02:00
Markus Zolliker
b19a8c2e5c converter for creating python config files 
+ testmode in server returns errors
+ fix in (old) statemachine

Change-Id: Icdfd6c3d8f70e717fecd61e8a54adad326be6000
 2023-01-23 18:00:56 +01:00
Markus Zolliker
68b45978a7 ppms.cfg: add target=0 in mf 
Change-Id: Ibccf95b54ba93a0b0648c61b7630ae376bf3e70e
 2023-01-23 18:00:20 +01:00
Markus Zolliker
7d4dfdebbd fix bug in k2601b 
convert returned float (which is integer) to int

Change-Id: I8363f4d5188f2b1be89f1383da20c76522286424
 2023-01-23 18:00:20 +01:00
Markus Zolliker
6c325460f7 make doc when .git is not there 
accept failure of secop.version.get_version()

Change-Id: Ia689bd4f56b848bc354c0d68826a3174f0746a97
 2023-01-23 18:00:20 +01:00
Markus Zolliker
c70b61e4e5 relax identification check 
accept *,SECoP,*

Change-Id: Ieb56e9c57fc5eb18e025fbc2f1d17a9d6e3f0a97
 2023-01-23 18:00:20 +01:00
l_samenv
589b857039 add driver for LakeShore 372 
- including channelswitcher
 2022-12-21 11:05:15 +01:00
l_samenv
ad4a6d2e09 improved cyoltd (flame magnet) 
- use a statemachine
- do more control in frappy, switching from persistent to driven
  internally
- a lot of fixes
 2022-12-21 11:00:19 +01:00
l_samenv
766f15beee improvements in magfield 
- use HasTargetLimits instead of HasLimits
- move ramp_tmo parameter to SompleMagfield
- add last_target method
- fix progress check in SimpleMagfield.ramp_to_target
- better mechanism for setting to persistent mode after restart
- fix switching mode
- fix on_error
- fix condition for shortcut start_field_change -> check_switch_off
- remove direct status updates
- move check for manual switch heater operations to ips_mercury
 2022-12-21 10:57:41 +01:00
l_samenv
79b8cd7b2d fix inheritance of status codes attached to state functions 2022-12-21 10:38:11 +01:00
l_samenv
bd0f3a0b07 fixe in triton and mercury 2022-12-19 16:13:06 +01:00
l_samenv
c4f9f2ef4b rename action to dil_action 2022-12-19 16:12:06 +01:00
l_samenv
0820d537c3 Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip 2022-12-19 16:09:40 +01:00
camea
1a6aa893e4 move persistent_field parameter from magnet.py to ips_magnet.py 
'persistent_field' is in principle the same as 'value'.
however, on IPS it might be different, at least it is a seperate
HW parameter
 2022-12-19 16:03:44 +01:00
camea
b10c722ff6 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2022-12-19 15:13:20 +01:00
camea
b7a1f17e5e fix new statemachine with ips magfield 
+ add on_error, on_restart etc. to states.py
+ add n_retry argument to mercury change/multichange
 2022-12-19 15:12:00 +01:00