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

77 Commits

Author SHA1 Message Date
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
Markus Zolliker
dc0cc590ed Merge branch 'wip' into develop 
Change-Id: Ib5084b8750b31523819c688f4954c52cef4d4a0c
 2023-05-31 14:06:05 +02:00
Oksana Shliakhtun
0771cb6899 working on lockin (SR) 
Change-Id: Ia8dc71bf1029feaa66614ade0f8e9e99358f142e
 2023-05-31 13:39:09 +02:00
Oksana Shliakhtun
564620e9e3 Test for lockin driver 
Change-Id: I9db745088efdef182154b71e019a0f6f83644278
 2023-05-31 13:39:09 +02:00
camea
726665ebd8 Merge branch 'wip' of gitlab.psi.ch-samenv:samenv/frappy into wip 2023-05-31 08:43:19 +02:00
camea
004533655f frappy_psi.magfield: bug in progress check 
must check for self.current (not self.value)

+ fix in mercury: __ramping must be initialized
 2023-05-31 08:42:17 +02:00
Markus Zolliker
c4d5d2e284 fix equipment_id in seadesc 
Change-Id: Iecf5d3ae815373c0535ee9e1c230b2f48554f5b5
 2023-05-30 15:12:36 +02:00
Markus Zolliker
75f156beef improve HasRamp 
Change-Id: I0ddabb8b2681712637a18c392da5424d30a05b4b
 2023-05-26 16:07:07 +02:00
Markus Zolliker
459a80b4d2 add Drivable with alias value and target 
together wih mixins HasConvergence and HasRamp

Change-Id: Ia36a8b44220e93cfeee98400f4276bfd7e40d82f
 2023-05-25 17:54:28 +02:00
Markus Zolliker
bef190b77d software ramp mixin 
+ fix frappy.lib.merge_status

Change-Id: I550eaeaab460a0d9ac1b027d59d4223dac4c0663
 2023-05-25 17:53:36 +02:00
Markus Zolliker
e4dbb90065 lakshore must not import from frappy_psi.mixins 
Change-Id: I988bef545f98d5c42d56af3fe4d5aae6dbf19809
 2023-05-25 17:52:27 +02:00
l_samenv
e1b30bf37e merge with wip branch 2023-05-17 17:00:06 +02:00
l_samenv
db94def694 newest version of okasanas drivers 2023-05-17 16:56:49 +02:00
Oksana Shliakhtun
85dd905cfd add SR lockin 
Change-Id: I4807ead7ceefcf0e266f7d215ef2898d54da9f53
 2023-05-17 16:03:18 +02:00
Oksana Shliakhtun
04b9bed7c9 thermofisher updates 
Change-Id: I6e7103e87cb3c1e69ef4d0e16d06e3d0fc3729ea
 2023-05-17 16:02:41 +02:00
Markus Zolliker
1407514458 phytron 
better handling of restart status

Change-Id: I28f97b49d39ed7c6b781f0d8edb218e63e1b1fc9
 2023-05-16 09:39:20 +02:00
Markus Zolliker
050a2dc8dc phytron next version 
with adaption of HasStates

Change-Id: I167ac8031bc5f7120c30031e7cfcb7587b42b61d
 2023-05-15 11:12:52 +02:00
Markus Zolliker
6697462f15 phytron: next fix 
Change-Id: I72debb43b02f07cf9ff79286293105f052314a35
 2023-05-15 09:03:58 +02:00
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
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
8039351395 mercury, ips, sea, triton, convergence 
after gerrit

Change-Id: Iff14047ecc476589aef10c96fae9970133b8bd14
 2023-05-09 14:57:34 +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
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
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
zebra
1961f91567 add switching_sensor 2023-05-02 16:39:34 +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
da15df076a fetched mlz version 
- before some chamges in the gerrit pipline

Change-Id: I33eb2d75f83345a7039d0fb709e66defefb1c3e0
 2023-05-02 15:25:11 +02:00
Markus Zolliker
1171245704 add playground 
+ fix SR_7270 communicator

Change-Id: If9604f9a6fe59ca3de3bbdbecf1b5053fce0573e
 2023-04-26 13:54:53 +02:00
Oksana Shliakhtun
ab1fdbae16 draft versions of lock-in and signal generator 
Change-Id: Icf4e3968efc3028af0de699a68a98a81e04ac9b6
 2023-04-26 11:33:49 +02:00
Oksana Shliakhtun
2d628e151c finished thermofisher 
but: convergence does not work yet properly
Change-Id: I834f8368730c347ba9f08a03eceae1a60fc66f90
 2023-04-26 10:23:48 +02:00
Markus Zolliker
64b4cba67c fix error from manual %-format conversion 
frappy_psi.ppms (line 263) was not correctly converted probably due
to the fact, that dict access with f-strings gets quite ugly.

As it seems we want to get rid of %-format, use str.format_map here.

Change-Id: Idf5b700554aa7a02a6647dc4672bf4a3856f92a5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30933
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-04-21 16:17:31 +02:00
Alexander Zaft
a334cc4f0a Manually convert most remaining format statements 
%d accepts floats and other things, so manual fixes are needed after
conversion.

After flynt -ll 2000 --aggressive, each was manually checked if the
casts with int() are needed.

Two statements are still missing in ls370res

Change-Id: I2651ddbe60695aa19582882a97d0f71bcb05c1ef
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30901
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-04-21 16:17:30 +02:00
Alexander Zaft
6f95c0d825 Convert formatting automatically to f-strings 
Automatically convert formatting with the following call:
flynt -ll 2000 -v frappy*
Result: 303/381 auto-converted.
Failing conversions will be looked at manually in a follow-up commit.

Change-Id: Icd996b27221202faccc15af78e0380cf52ee37f2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30900
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-04-21 16:17:30 +02:00
Alexander Zaft
a9d479ba0a Change leftover %-logging calls to lazy 
Change-Id: I0bee8d02ac364ab93f77919cae78afa386b85c85
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30899
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2023-04-21 16:17:30 +02:00
Markus Zolliker
361f9ac4fc remove UNKNOWN, UNSTABLE and DISABLED from Readable.status 
- re-add them where needed (epics, entangle ...)

Change-Id: I2b8af9f5f86285f081d5418211f6940e80a1dbd7
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30718
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-04-21 16:17:30 +02:00
Markus Zolliker
0d265b9752 make return value 'Done' unneccessary 
'Done' was introduced in order to suppress unneccessary
duplicate updates. However, since super calls on access methods are
allowed, it is not nice when such a method returns Done, as this
is not automagically replaced by the current parameter value.
As a consequence:

- using Done is discouraged, but not (yet) removed in all code
- the 'omit_unchanged_within' property is moved from Module to an
  internal Parameter property 'update_unchanged'
- its default is moved from a SEC node property to generalConfig
- the 'update_unchanged' parameter property may be set to
  'never' for parameters where duplicate updates make no sense
- this property might be set to 'always', for measurements, where
  even unchanged values taken from HW should be transmitted

Change-Id: I2847c983ca09c2c4098e402edd08d0c96c3913f4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30672
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-04-21 16:17:30 +02:00
Markus Zolliker
c0704b3d4f split BadValue into WrongType and RangeError 
in order to match SECoP specification

fixes #4668

Change-Id: Ica73a8171536ccc324cf8db915347a6263c2d736
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30625
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-04-21 16:16:40 +02:00
Oksana Shliakhtun
5fb1e649ab Driver for ThermoFisher A 10 
Change-Id: Ic19ae444c3b4242f3bb1fe83852d4521326d0b9d
 2023-04-13 15:14:44 +02:00
Oksana Shliakhtun
7a3cfe9836 fix %g in the write_target 
Change-Id: I3c15ed44848c792320dd146d17d4bb52f30f49f0
 2023-03-08 14:57:22 +01:00