|
|
9fc6b6c0fd
|
add ill3 and ori1 stick
|
2023-05-02 09:31:09 +02:00 |
|
|
|
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 |
|
|
|
68b45978a7
|
ppms.cfg: add target=0 in mf
Change-Id: Ibccf95b54ba93a0b0648c61b7630ae376bf3e70e
|
2023-01-23 18:00:20 +01:00 |
|
|
|
7d4dfdebbd
|
fix bug in k2601b
convert returned float (which is integer) to int
Change-Id: I8363f4d5188f2b1be89f1383da20c76522286424
|
2023-01-23 18:00:20 +01:00 |
|
|
|
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 |
|
|
|
c70b61e4e5
|
relax identification check
accept *,SECoP,*
Change-Id: Ieb56e9c57fc5eb18e025fbc2f1d17a9d6e3f0a97
|
2023-01-23 18:00:20 +01:00 |
|
|
|
589b857039
|
add driver for LakeShore 372
- including channelswitcher
|
2022-12-21 11:05:15 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
79b8cd7b2d
|
fix inheritance of status codes attached to state functions
|
2022-12-21 10:38:11 +01:00 |
|
|
|
bd0f3a0b07
|
fixe in triton and mercury
|
2022-12-19 16:13:06 +01:00 |
|
|
|
c4f9f2ef4b
|
rename action to dil_action
|
2022-12-19 16:12:06 +01:00 |
|
|
|
0820d537c3
|
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
|
2022-12-19 16:09:40 +01:00 |
|
|
|
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 |
|
|
|
b10c722ff6
|
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
|
2022-12-19 15:13:20 +01:00 |
|
|
|
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 |
|
|
|
a0d14c30be
|
attocube: more robust moving
- try up to 10 times when end of travel or no more progress
- issue WARN instead of ERROR when moving did not work
|
2022-12-02 10:37:45 +01:00 |
|
|
|
e668b6a439
|
attocube: add offset and change to HasTargetLimits
|
2022-12-02 09:12:51 +01:00 |
|
|
|
3483c3374d
|
allow pollinterval = 0
|
2022-12-02 09:10:07 +01:00 |
|
|
|
d71a512454
|
new features HasTargetLimits and HasSimpleOffset
according to standard
|
2022-12-02 09:07:20 +01:00 |
|
|
|
b1608c4d7f
|
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
|
2022-12-02 09:00:12 +01:00 |
|
|
|
e4c1f35e4a
|
add attocube
|
2022-12-02 08:54:26 +01:00 |
|
|
|
3ab7eb99ab
|
add flamemag / flamedil config
|
2022-11-30 14:14:47 +01:00 |
|
|
|
ef9d89993c
|
new specs of HasOffset and target_limits
|
2022-11-30 14:14:06 +01:00 |
|
|
|
9887ba0721
|
improve Attached
- allow a default value
- make copy method work properly
|
2022-11-30 14:11:05 +01:00 |
|
|
|
397ca350f8
|
add FLAMP furnace
|
2022-11-24 07:56:09 +01:00 |
|
|
|
99220400f1
|
add FS furnace
|
2022-11-24 07:55:36 +01:00 |
|
|
|
4e8636a620
|
heliox: make temperatures seperate modules
|
2022-11-24 07:50:24 +01:00 |
|
|
|
f14bd553a8
|
disable closed loop on MA10 rotator
|
2022-11-24 07:49:36 +01:00 |
|
|
|
2845a82236
|
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
|
2022-11-23 22:41:49 +01:00 |
|
|
|
4f5cc3059e
|
add FT furnace
|
2022-11-23 22:41:23 +01:00 |
|
|
|
d845fedc03
|
Merge branch 'wip' of gitlab.psi.ch:samenv/frappy into wip
|
2022-11-21 14:38:40 +01:00 |
|
|
|
1b2e364f70
|
magfield adapted to new state machine
|
2022-11-21 14:37:53 +01:00 |
|
|
|
4405b2b02c
|
new state machine, HasStates mixin
|
2022-11-21 14:13:52 +01:00 |
|
|
|
49b9bfa11d
|
improvements for triton
- set cooldown channel befor setting action
- improve max heater setting
|
2022-11-15 16:57:52 +01:00 |
|
|
|
df428f4c0c
|
check readback and try up to 3 times when it does not match
|
2022-11-15 16:57:00 +01:00 |
|
|
|
0c93ca8c75
|
add comment "do not use mb11stick"
|
2022-10-18 16:41:04 +02:00 |
|
|
|
971c1dcfee
|
Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip
|
2022-10-04 15:13:23 +02:00 |
|
|
|
498dbd4179
|
sea.py: fix status datatype
sea status is a string (not a tuple) and needs therefore
special treatment.
interestingly this bug did not yet appear ...
|
2022-10-04 15:11:57 +02:00 |
|
|
|
00b0a54f12
|
ramp unit must be $/min
|
2022-09-22 17:12:54 +02:00 |
|
|
|
48076edd99
|
improve magfield and ips_mercury
|
2022-09-22 17:12:30 +02:00 |
|
|
|
485e81bfb0
|
[deb] Release v0.13.1
Change-Id: Ib038475d75de7b2976bc463423c2493eb531c02a
|
2022-09-21 16:19:34 +02:00 |
|
|
|
0df50bb0f9
|
secop_mlz: minor rework entangle client
Change-Id: Ie406b4220c22cdbf302a1fd36f2d7407d81a47fa
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28951
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>
|
2022-09-21 16:17:01 +02:00 |
|
|
|
de5f17695c
|
make startup faster in case of errors
When the io of one SECoP module fails, it takes ages to startup
because each parameter poll takes the time to wait for a timeout.
After the first communication error on an io, no more startup polls
are tried on the modules using this io.
Change-Id: I0d250953dfe91a7d68d2d2b108395cc25d471afe
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/28588
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-09-21 16:16:48 +02:00 |
|
|
|
e4aa2149f7
|
phytron: fix warning on repeated comm. error
log only a warning when several retries ware successful
Change-Id: I2f1dfba920b0841914da82229820bcdd4b97c6e9
|
2022-09-21 11:35:42 +02:00 |
|
|
|
9f656546df
|
fix undefined status in softcal
|
2022-09-20 12:07:11 +02:00 |
|
|
|
5affb9f31b
|
fix bug in persistent.py
- use dirname instead of basename
|
2022-09-20 12:07:11 +02:00 |
|
|
|
5e3bf96df1
|
rework of uniax
- try to deal with anomaly at 17 N
- reduce pid on overshoot
- use new statemachine
|
2022-09-20 12:07:11 +02:00 |
|
|
|
07995e2235
|
fix bug when restarting statemachine
fixed bad if clause
+ better debug message on restart/stop
|
2022-09-20 12:07:10 +02:00 |
|
|
|
54f091d0fe
|
disable encoder for ma6 stick motor
|
2022-09-19 11:38:33 +02:00 |
|
