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

103 Commits

Author SHA1 Message Date
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
Oksana Shliakhtun
e12f2bacb1 fix read_setpoint 
Change-Id: I8c6449979aca294af13c350b7632190121bc4230
 2023-03-08 14:52:16 +01:00
Oksana Shliakhtun
d6c641e67b fix set/get_par 
Change-Id: I9790a667bc2e89baf2be9e35edb7473cdfc5dd31
 2023-03-08 14:49:56 +01:00
Oksana Shliakhtun
ec15a35977 lakeshore ramp 
Change-Id: I323c2b88e554bc2dc9c3f1af2b23f99aa082489f
 2023-03-08 14:37:56 +01:00
Markus Zolliker
05415e79b1 qnw: WARN status when control is off 
Change-Id: Ic91607658b4c0f3a622ad7307aa55d927c82914b
 2023-03-06 14:05:01 +01:00
Markus Zolliker
908f2d4c23 fix minor issues in ppmssim and k2601b 
merging changes in gitpsi and gitmlz branch

Change-Id: I4996da637ad62c5bd76596ea95aee1decaaccaf2
 2023-03-06 08:24:16 +01:00
Markus Zolliker
05cf4a791a demo lakeshore with simulation 
- example for lakeshore tutorial
- lakeshore simulator (merge with frappy_psils370sim)
- rename stringio-server to sim-server

Change-Id: I33a9c75ea268349573f8a8387910921e19f242eb
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30516
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-03-06 08:24:15 +01:00
Markus Zolliker
0acb80380a fix ppms with proxy 
- proxy: remote parameter status should overddide datatype from
  ProxyModule.status
- ppms: create PpmsDrivable instead of importing from
  (PpmsBase, Drivable). Order matters for status parameter!
- update cfg files

Change-Id: If8fc263cffb903d8b3c1a93a089dcac3597d13a0
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30512
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-03-06 08:24:15 +01:00
Oksana Shliakhtun
bc553f889c Implement ramping qnw 
Change-Id: I9d7fab73194a0a8be3a230cc7ca99066d2553fce
 2023-03-02 17:01:43 +01:00
Oksana Shliakhtun
cae225df41 create qnw driver 
Change-Id: I7b466caf91b7a2a177fa94ac84cdfc315475f959
 2023-03-01 17:49:15 +01:00
Oksana Shliakhtun
3a52f9d31c fixes in lakeshore alarm 
Change-Id: Ibbcbe94d9a64d1c074025183e1310506a2cb00f4
 2023-03-01 17:49:15 +01:00
Markus Zolliker
edd3437682 improve persistent parameters 
A value given in config overrides values read from the persistent data file.
To let the loaded parameter have precedence, configure a default only.
The write_<param> method of a persistent parameter is now always called
on startup.

- add tests for persistent behaviour
+ simplify Modules.writeInitParams: remove started_callback argument

Change-Id: I08b49de52e9d9a2ed0918018eb2fe538141a4f5e
 2023-02-20 12:50:19 +01:00
Oksana Shliakhtun
6b9d4a8140 . 
Change-Id: I45df6909814299a26eefdb25c63b827741872d82
 2023-02-02 17:31:24 +01:00
Oksana Shliakhtun
af295b12b0 fixed write_alarm 
Change-Id: I1c155a63c7340aa1292bc1e530cedfcc72d5ffed
 2023-02-02 17:25:34 +01:00
Oksana Shliakhtun
69dd011260 Added alarms 
Change-Id: Idd06278e44e01522ddf904b56a452ce8c704b5a6
 2023-02-02 17:22:08 +01:00
Oksana Shliakhtun
d62076128a add comma between command and arguments 
Change-Id: Ibc3a9072140842d521ebb4840eecb180e69b134e
 2023-01-31 09:42:45 +01:00
Oksana Shliakhtun
2ee9ea65da fix SETP? 
Change-Id: I337adece10204ca67dcf720e4de36085b80601ba
 2023-01-30 17:13:52 +01:00
Oksana Shliakhtun
0dfaa79f77 fix set_par/get_par calls 
Change-Id: Iff6b244ca381849333646853b4c0bb8a347bbb3b
 2023-01-30 17:09:46 +01:00
Oksana Shliakhtun
866fe73f2e fix CDISP 
Change-Id: I09010a1997799bed04f25a7a3eb0157f7af5ad8b
 2023-01-30 17:04:28 +01:00
l_samenv
f5c96214b0 Merge branch 'develop' of gitlab.psi.ch:samenv/frappy into develop 2023-01-30 16:57:29 +01:00
l_samenv
4d28abe141 fix issue with old reading 
- old reading shoould be ignored
- fix channels for CTI7
 2023-01-30 16:56:31 +01:00
Oksana Shliakhtun
c75d7f17f7 The PID parameters were added. 
Change-Id: I67a7db66ca13b60d35cb4041bbd35c6c4729416c
 2023-01-30 16:52:06 +01:00
Oksana Shliakhtun
a384664639 first version of lakeshore 340 driver 
Change-Id: Ie9a68be61e142802b2e71420b87623b7a4b4f645
 2023-01-24 18:13:34 +01:00
Oksana Shliakhtun
ee708f7b02 fix typo in frappy_psi.mixins 
Change-Id: Ifccb6278bbfc221882067a2ae8c72d0163e5f351
 2023-01-24 18:12:25 +01:00
Markus Zolliker
edc942cb24 introduce frappy_psi.mixins 
containing for now: HasControlledBy, HasOutputModule

Change-Id: I27e3a81d6e985c74440eb9ea6d224272bac4fb7d
 2023-01-24 15:33:27 +01:00