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

118 Commits

Author SHA1 Message Date
Markus Zolliker
d55ee42612 remove more coding cookies 
mainly from frappy_psi

Change-Id: I192811459aebe97f3076888cd31a308a51e6aa49
 2024-01-29 16:00:44 +01:00
Alexander Zaft
75cfffb548 all: remove coding cookies 
Change-Id: I53a4d79c3ebc50b8aed43a5ef1fa6538f8059a47
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32251
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 16:00:08 +01:00
Markus Zolliker
7333ccd7a6 implement pfeiffer TPG vacuum reading 
this is an example where StringIO.communicate has to be extended

Change-Id: Iff6bb426ee7960904993574531de84793152e21d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32385
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>
 2024-01-29 15:57:25 +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
a429852c80 adopt frappy_psi and frappy changes from wip 
Change-Id: I4e6732e755398d88b73007fb53b758039c5d4483
 2024-01-29 10:56:58 +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
Markus Zolliker
d2e7ce7242 fix simulation 
+ some fixed in sim_uniax

Change-Id: Ia8703ed988aa904bb2694339f0d3175b28fcb33e
 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
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
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
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
Markus Zolliker
6b8e6498fa Revert "revert commits done before MZ holidays" 
This reverts commit d2885bdd72.
 2023-10-16 17:49:30 +02:00
Markus Zolliker
4fc6ef52da frappy_psi.phytron: stop motor before restart 
restarting the phytron motor without prior stop leads
to funny behaviour.

- send stop before restart
- stop motor when moving but status not busy
- restart when motor drives the wrong way

+ better status text when stopping

Change-Id: I82cd59297b3c79a354a4eeb5ba03fc65bedf755f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31929
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
e866ae7034 frappy_psi.sea: further bug fixes 
- in SEA, it is not guaranteed that the is_running state is set
  before the run command returns. as a consequence, we have to
  wait in SeaDrivable.write_target for is_running being set
- syncio has always to be reconnected after asynio

Change-Id: Ia46cff11de86868ce0627faaf6f776282bd7a8f4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31631
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>
 2023-10-16 17:49:19 +02:00
Markus Zolliker
2fc9eccfd5 frappy_psi.sea: avoid multiple connections 
the _connect was sometimes started in parallel from
startModules and the first call to doPoll.
remove the first one, and protect the second one
with a lock

Change-Id: I079439e150efd5d005130cef475f6326f933ecbd
 2023-10-16 17:49:19 +02:00
Markus Zolliker
8124ed3294 revert commits done before MZ holidays 
they are all not neccessary for SINQ SE operation

Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
 2023-10-16 17:49:19 +02:00
Markus Zolliker
ff6a98af92 frappy_psi.thermofisher: add version through gerrit 
Change-Id: I4b89d6ec803ad64c41720bc62493d2e4027df50e
 2023-10-16 17:49:19 +02:00
Markus Zolliker
bee591c861 frappy_psi.sea: try to reconnect on failure 
both .asynio and .syncio connection should be tried to reopen.
(fix from mlz gerrit)

Change-Id: I0da5bd9927865a1c55afb93a7a5b76c44fc8750e
 2023-10-16 17:49:19 +02:00
l_samenv
8e7e70c50e frappy_psi.sea: auto connect 
on both .ssynio and /syncio try to reconnect after failure
 2023-10-16 17:49:19 +02:00
Markus Zolliker
5a19103d0e frappy_psi.thermofisher improvements 
- merge Loop with Sensor
- make convergence work

Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
 2023-10-16 17:45:45 +02:00
Markus Zolliker
e201e7dce9 up to date with develop/mlz 
Change-Id: I5ea71bc99a2f0dffc3dbe37e1119eb188ef8a3f0
 2023-10-16 17:42:53 +02:00
Oksana Shliakhtun
c9ccaa484a SR830: moved dicts out of class 
Change-Id: If056b1bf4e81c3b609ded087dff2b40c7119903f
 2023-10-16 13:43:57 +02:00
Oksana Shliakhtun
a5dfc82b95 Changed write_range, write_tc methods 
Change-Id: I335f97bd54deaccf0552b27deb3a7dfe73074e4c
 2023-10-09 14:28:16 +02:00
Oksana Shliakhtun
e22da0db67 Changed driver for lock-in 65 
Change-Id: Ic452f2309e54dd583a1ff796e82a12469357830d
 2023-09-28 09:15:25 +02:00
Oksana Shliakhtun
e89bc07759 New driver for lock-in amplifier SR830 
Change-Id: I45c5a06460f4b84cade0eae53188b058510c4473
 2023-09-28 09:14:22 +02:00
Oksana Shliakhtun
e405783716 Removed status 
Change-Id: I276fe69a4ca46f536be022d9604377378e41f26c
 2023-07-12 15:19:16 +02:00
Oksana Shliakhtun
dc59906c8a Added tc for the Ametek 7265 
Change-Id: Ifd8e55b2da14cb41391f72787cd726951192ec95
 2023-07-12 15:13:35 +02:00
Oksana Shliakhtun
04940b1a0b write_range, write_tc, string_to_value method 
Change-Id: I6f81db72e852d2670e0a774a621c8382680bb93a
 2023-06-28 13:03:21 +02:00
Oksana Shliakhtun
6f6f07b0f9 The write method is changed 
Change-Id: I5ffeecfeb43804d1f443e500808d9ff83c507d18
 2023-06-27 09:56:28 +02:00
Markus Zolliker
87830a1473 branch develop: recent changes from branch wip 
Change-Id: I2e1173423f2aa164a8a7158921b354c2aff1ab2c
 2023-06-20 10:59:18 +02:00
Markus Zolliker
720d010c47 frappy_psi.thermofisher improvements 
- merge Loop with Sensor
- make convergence work

Change-Id: Iba0cafc524ada6d490b7a5c30f4127e77fd163f3
 2023-06-05 09:52:18 +02:00
Markus Zolliker
9e52665b88 frappy_psi.convergence: improvments 
- merge_status
- empty string instead of 'approaching'
- dif <= tol

Change-Id: I6f10875f7ef5d2109c13d7448ede114b8e30d86e
 2023-06-05 09:52:18 +02:00
Oksana Shliakhtun
33fb90af05 fixed autorange, vmode, amp, irange, freq 
Change-Id: Idae23ad1b5716375484acf0410843141e2e45d24
 2023-06-01 17:03:02 +02:00
Oksana Shliakhtun
da122ad961 edited lockin (SR) 
Change-Id: I66d95144d61c62a2396933c2f9a7ce6e05917fe4
 2023-05-31 17:25:59 +02:00