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

1311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Zaft
ae2a731161 mlz/demo: move old examples to Attached 
change very early version of module attachments in GarfieldMagnet and
MagnetigField to use Attached

Change-Id: I616ad17bc72cd93d86e1b3e3609543cfe90edcd8
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32250
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-01-29 15:56:23 +01:00
Alexander Zaft
ec664d9268 core: move module handling out of dispatcher 
Split module handling code from the dispatcher.
The new class for managing Modules is called SecNode.

* change logging to no longer need a reference to modobj
* modules get a reference to the secnode obj instead of the
  dispatcher
* intermediate usage fixes for frappy_psi/sea

Change-Id: Ifee4bb47aa7a4508bb4a47c9a5873b7e2d5faf67
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32249
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-01-29 15:56:19 +01:00
Markus Zolliker
4ca7bf0a7d logdif.py: only one commit needs to be new enough 
+ fixe intendation

Change-Id: I4b0c393767925532e1f105e80a215839a02214af
 2024-01-29 15:55:52 +01:00
Markus Zolliker
715fcf4d36 added logdif.py 
a tool the compare commits in branches

Change-Id: I503941b76bb567ea4c3d33b986406a910154fda6
 2024-01-29 11:42:43 +01:00
Markus Zolliker
a429852c80 adopt frappy_psi and frappy changes from wip 
Change-Id: I4e6732e755398d88b73007fb53b758039c5d4483
 2024-01-29 10:56:58 +01:00
Markus Zolliker
3eb5f90ce6 remove unneeded cfg/varioxb_cfg.py 
Change-Id: Id731b4462e6bd91de66ee271e916aec044374fce
 2024-01-29 10:47:54 +01:00
Markus Zolliker
f1115c937b add cfg files from wip 
Change-Id: I71b647c269c10eac7241970377d6f812636d082f
 2024-01-29 10:45:42 +01:00
Markus Zolliker
91d0f2c635 remove unneeded config files 
Change-Id: I0a6a2d1471172ed2604265454b322a9f11f8d266
 2024-01-29 10:41:25 +01:00
Markus Zolliker
614a49f3e3 adopt sea amd cfg changes from wip 
Change-Id: I83b82ece53e0cb3394551c122561a042499527d8
 2024-01-29 10:33:47 +01:00
Markus Zolliker
1e56f2f39e frappy_psi/SR.py: move soft auto range from read_value to doPoll 
Change-Id: Ia94e081eaa4c28b1f436227635d7c5beb883792b
 2024-01-29 10:27:22 +01:00
Markus Zolliker
82e9b599ad sea: make sure status is error when reading main value failed 
+ cosmetic changes using status codes

Change-Id: Ice49a6d5494d2e2cba76d138f11dffeba9aa349d
 2023-12-11 08:24:11 +01:00
Oksana Shliakhtun
c4781d3d70 Autogain function for SR830 lock-in driver 
Change-Id: If07ec9182e5153e1237b9818ce555162f54e0ae5
 2023-11-20 13:20:28 +01:00
Oksana Shliakhtun
c0b928f2f6 Driver for ThermoHaake Phoenix P1 Circulator 
Change-Id: I0573eeac2e40b4715072661c819701186733bf94
 2023-11-07 13:26:16 +01:00
Oksana Shliakhtun
73bb0cff1e For the lockin830 get_par/set_par are implemented. 
Change-Id: I5b6707a07d936d24528173a2edae49a148081ff9
 2023-10-31 17:26:35 +01:00
Markus Zolliker
6454e5f96e frappy_psi/thermofisher: version through gerrit 
Change-Id: I6999e84d1c5efd0625c6df89e97dad46e5a8cd59
 2023-10-16 17:49:36 +02:00
Markus Zolliker
3f53823c07 newset version of oksanas drivers 
Change-Id: Ia6d8b727e48e96a14b75feeef5d3e6c002cb82a0
 2023-10-16 17:49:36 +02:00
zebra
fe60a8ebd8 frappy_psi.phytron: implement limit switches 2023-10-16 17:49:36 +02:00
zebra
fb0a689786 ma6: make ts drivable 2023-10-16 17:49:36 +02:00
zebra
2ee12a62f0 fix ma15 sea config 2023-10-16 17:49:36 +02:00
zebra
de970ece3a configs for sample heat stick 2023-10-16 17:49:36 +02:00
Markus Zolliker
59810aa748 proxy: fix command wrapper 
bugfix: return only value of execCommand result, not qualifiers
Change-Id: Iff14779050daa9886e9f7d0396317c5a41695cd1
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32235
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:36 +02:00
Markus Zolliker
d2e7ce7242 fix simulation 
+ some fixed in sim_uniax

Change-Id: Ia8703ed988aa904bb2694339f0d3175b28fcb33e
 2023-10-16 17:49:36 +02:00
Markus Zolliker
72fbed289d more cfg file fixes 
Change-Id: I0ba86cd17bb07f480cac6f20994ee854c6e811ae
 2023-10-16 17:49:36 +02:00
l_samenv
60c6553ee7 cleanup cfg files 2023-10-16 17:49:36 +02:00
l_samenv
cf10590245 improvements for flame 
- frappy_psi.channelswitcher: use isBusy instead of checking value and target
- frappy_psi.ls372: remove underflow mechanism
- frappy_psi.parmod.SwitchDriv: switch the controlled module also when not buys
 2023-10-16 17:49:36 +02:00
l_samenv
44c59bd818 flamedil as of 2023-07-04 2023-10-16 17:49:36 +02:00
l_samenv
c355999e85 flamedil as of 2023-07-03 2023-10-16 17:49:36 +02:00
l_samenv
4f0daf3424 flame sample combined T 2023-10-16 17:49:36 +02:00
l_samenv
be7c9eec8c frappy_psi.ls372: add TemperatureSensor and TemperatureLoop 2023-10-16 17:49:36 +02:00
l_samenv
ef5f4cd2f3 frappy_psi.cryoltd: fixes after frappy upgrade 2023-10-16 17:49:36 +02:00
l_samenv
1da16f12c4 frappy_psi.triton: try to fix channel selection before condense action 2023-10-16 17:49:36 +02:00
Markus Zolliker
2658dd8090 frappy_psi.sea: small fixes 
- changes in return value of frappy_config command in sea
- do not store sea manager

Change-Id: I5bc1d9a281ad2285b90d3649b4c702a3501d451d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32166
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:31 +02:00
Markus Zolliker
fa5d5654f8 phytron.py: improve status 
better analysis of hardware status code

Change-Id: I667b443649db43ff3e572e0a50685aabc9ba2ca2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32165
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:31 +02:00
tasp
bf8d5101b0 add ill2 2023-10-16 17:49:30 +02:00
tasp
31b5928725 fix fs config 2023-10-16 17:49:30 +02:00
tasp
110855200a more consistent ori1 stick json file 2023-10-16 17:49:30 +02:00
Markus Zolliker
21f9921269 improve client shutdown time 
in SecopClient.disconnect joinng the reconnect thread may take
up to 10 s, because of the time.sleep(10) call in the reconnect
thread.

change the _shutdown attribute from bool to an Event, and
use Event.wait instead of time.sleep

Change-Id: Icea6a14ad73df0b3d26ef45806f4c05e6bf18492
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32137
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:30 +02:00
Markus Zolliker
bce88ff343 change FloatRange arguments minval/maxval to min/max 
in the previous version FloatRange(max=100) was neither working
properly nor complaining, because the maxval=None default was
overriding the value for max.

possible fixes:
  - raise an error when min/max used as argument (confusing for
    the programmer, as it is a property)
  - allow both versions minval/maxval and min/max (more code)
  - use min/max and a pylint directive here (the only thing to
    take care is not to use the min/max builtin in __init__)

this change uses the last option for the fix

Change-Id: Iff0e0c4d0d7b165003bdeffa67a93a1cd7f29eea
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31982
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:30 +02:00
Markus Zolliker
5359f0351f fix frappy_demo.lakeshore 
reading back the target does not work properly, because
  a) the readback value might be delayed
  b) there is no command to read back the target, SETP?1
     is returning the working setpoint, which might be distinct
     in case of a ramp

Change-Id: I0da2dbfc1a8ddbecbae6d0456ff64e008bc56336
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31983
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:30 +02:00
Markus Zolliker
ab2e001093 psi: improve sea interface 
- get return value from teh frappy-config script in order
  to detect failures
- call config_check not more than once within 1 sec

Change-Id: Ibe42e846521206463f2761d452aea7e558a36854
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32139
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:30 +02:00
Markus Zolliker
ff0e77a166 fix missing .poll attribute in simulation 
using super() in SimBase.__new__ fixes the problem

Change-Id: I18d0ba6ac476c2edb0d973090bcb09508a983d6a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32136
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>
 2023-10-16 17:49:30 +02:00
Markus Zolliker
195a48f366 further fixes after change 31470 
- get_module is to be called when io is autocreated
- register_module is missing in playground

Change-Id: I28884575b71320667107c494473b0fc5d4363a50
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32123
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>
 2023-10-16 17:49:30 +02:00
Markus Zolliker
2110f8d83b add parmod.Par 
the reasonly class frappy_psi.parmod.Par represents a parameter
or a component of a tuple parameter

Change-Id: I47208c9d7a6fc377cd56b82cc6a9e8cdb433fe8e
 2023-10-16 17:49:30 +02:00
Markus Zolliker
4c6c7c7950 improve shutdown time 
on shutdown, time.sleep(10) is blocking the reconnect thread.
change the _shutdown attribute from bool to an Event, and
use Event.wait instead of time.sleep

Change-Id: Icea6a14ad73df0b3d26ef45806f4c05e6bf18492
 2023-10-16 17:49:30 +02:00
Markus Zolliker
7d7972b73f fix frappy/playground.py after change 31470 
assumptions about dispatcher in playground.py are no longer
valid.

- let Dispatcher class in playground inherit from real dispatcher
+ improve log messages

Change-Id: I2a9a9d532dabadc590543660c445c021dd2f2891
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31967
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>
 2023-10-16 17:49:30 +02:00
sans
fc40f5e0c9 ma10: improve sea cfg 2023-10-16 17:49:30 +02:00
sans
a19b085c30 hvolt_short stick: make hcp writable 2023-10-16 17:49:30 +02:00
focus
09772eb746 stickmotor addon: add backlash -1 2023-10-16 17:49:30 +02:00
Markus Zolliker
c249b1648d frappy_psi.phytron: further improvements 
unfortunaely, sometimes communication errors happen.
workaround: try several times reading the status

Change-Id: I2788c6c9b4145246cdd51c31b246abffee60f93b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32032
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-10-16 17:49:30 +02:00
Alexander Zaft
480913dabe add zapf to requirements-dev 
Change-Id: I6dddd8d4c590253f1039b89edae561fa90b40811
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31725
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-10-16 17:49:30 +02:00