linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,402 Commits 18 Branches 1 Tag
wip
Commit Graph

209 Commits

Author SHA1 Message Date
Markus Zolliker
2e99e45aea WIP new version of ultrasound 
Change-Id: Iadb83396a64e277f6f0a37f7a96d92105648c4fe
 2025-01-28 09:40:36 +01:00
Markus Zolliker
a25a368491 take over changes from ultrasound PC 
Change-Id: I1eae717a5963e618d87ddf52db991d428a046d24
 2025-01-09 11:23:12 +01:00
Markus Zolliker
4397d8db1a WIP: old oxford devices (ILM, IPS, IGH...) 
Change-Id: I4ca0dc6149d257818d300db4d886a1e33e8210be
 2025-01-09 10:09:33 +01:00
Markus Zolliker
e60ac5e655 move start_ramp_to_target to SimpleMagfiield 
Change-Id: Iab3fe8738c560bf5ac2f11a4a34428a8ffd6a7c2
 2024-12-20 15:49:33 +01:00
Markus Zolliker
0b5b40cfba frappy_psi.ccu4: some smaller updates 
Change-Id: I128ac57aad951fd8ad3bdf663c69c85644063645
 2024-12-18 15:40:05 +01:00
Markus Zolliker
1ae19d03b3 frappy_psi.sea: fix case when bool is implemented as text 
introduce SeaBool for this

Change-Id: I9c6b6ee7d33f11b173d612efc044fce8a563f626
 2024-12-10 16:29:07 +01:00
Markus Zolliker
6cbb3a094b frappy_psi.pulse: fix fatal errors 
even when a module is work in progress, it should not raise
an error on import

Change-Id: I2f91301ba2b0c574ea344c36a74da0f893aa326d
 2024-12-06 11:58:45 +01:00
Markus Zolliker
654a472a7e frappy_psi.sea: more improvements 
- add sea_path property
- add LscDrivable (config of these modules is easier to understand)

Change-Id: I616dc94de6e784f6d8cfcf080d9a8408cbf73d93
 2024-12-03 15:12:02 +01:00
l_samenv
ddc72d0ea7 sea: fix parameter name mapping 
- rel_path = ['tm', '.', 'set'] should mean:

'tm': tm parameters first, with /<obj?/tm as main value
'.': then all parameters directly at top level, except 'set'
'set': all parameters  below 'set'
driving happens at object level

- better name mangling (the 1st appearance of the same shortname
  is kept short)
 2024-11-28 18:06:14 +01:00
Markus Zolliker
49bf0d21a9 frappy_psi.bkpower: improve doc 
Change-Id: I0736d1d8a40b0140bfdbf5aca189b8ddc5b22973
 2024-11-26 13:39:34 +01:00
Markus Zolliker
142add9109 add sim-server again based on socketserver 
- fix ls370test config file
+ fix issues with frappy_psi.ls370res
+ add frappy_psi.ls370sim

Change-Id: Ie61e3ea01c4b9c7c1286426504e50acf9413a8ba
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34957
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-11-19 14:03:28 +01:00
Jens Krüger
5deaf4cfd9 PSI: Fix import error on ThermoFisher module 
Change-Id: I691d8f5057fdb19ba14c109399417a7ee9962637
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34954
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-11-15 10:39:47 +01:00
dmc
edf5a5568b frappy_psi.sea: fix buf, revert change of updateEvent to udpateItem 
this is not possible in ProxyClient
 2024-10-24 13:29:26 +02:00
sans
4892c2fd8f frappy_psi/parmod: fix Driv 
registering updates should be done in initModules
 2024-10-22 09:28:39 +02:00
Markus Zolliker
73a54dfc44 frappy_psi.sea: avoid error on import 
the previous code raised an error when generalConfig.init() was
not called before importing. defer evaluation of seaconfdir to
the time it is used

+ use updateItem instead of updateEvent to avoid pylint complaint

Change-Id: I0da0891a8d4091102d2a149705f5546e2f6fd187
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34813
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>
 2024-10-17 08:07:11 +02:00
Alexander Zaft
f36af47b98 psi: change open calls in sea 
Change-Id: I4fe235027df4ea935d84e29895eb280f620afbdf
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34665
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-10-17 08:07:11 +02:00
Alexander Zaft
13db0d6bc6 generalConfig, config: use pathlib 
- switch to pathlib
- represent multiple confdirs as list of Paths internally, not string
  with pathsep

Change-Id: I1418e561641e27cd904af0762be056cd66ee1919
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34464
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
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>
 2024-10-17 08:07:11 +02:00
Markus Zolliker
abfb8afdc5 frappy_psi.motorvalve: move doc string to class 
- this will allow to add other classes if needed

Change-Id: I452c2be19456829796d899891719f5659fac2ba9
 2024-09-23 15:05:54 +02:00
Markus Zolliker
7fdb2e7e2f frappy_psi.trinamic: improve 
- try several times in case of no success (configurable)
- write default values to the controller
- add limits

Change-Id: I7974d7056bbad48091653378366943ccf3e6f945
 2024-09-23 15:04:44 +02:00
Jens Krüger
f2940d3f23 SINQ/SEA: Fix import error due to None value 
If the environment variable isn't set a None value is returned. Now an
empty string will be returned

Fixes: #4882

Change-Id: I3e319daebf10e2d8ea3ee00f6094e6896e54f51b
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34234
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Jens Krueger <jens.krueger@tum.de>
 2024-09-13 09:01:01 +02:00
Markus Zolliker
fb5e468048 frappy_psi.sea: use raise from 
this was complained by Jenkins after merging (1)

Change-Id: I9e4eb57004d218021978d6e9e06e1cbd42ec5e9c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34024
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-09-13 08:58:53 +02:00
Oksana Shliakhtun
6c01a1e48a Draft for the Keythley Pulse System driver 
Change-Id: Idd6f86acbaac178ab8031625b36ded1351de6a34
 2024-08-27 15:16:27 +02:00
Oksana Shliakhtun
96412cb480 Comments 
Change-Id: Ie7fe10f704aec62c19cae0bab16d43d55d911a36
 2024-08-27 15:16:27 +02:00
Oksana Shliakhtun
807afba53b Changed temperature range 
Change-Id: Ib2a0bc59b191d33e65420375385d8807754193a9
 2024-08-27 15:16:11 +02:00
Oksana Shliakhtun
97032193bf Changed temperatures 
Change-Id: I1411e425bd911b73cfcb459de50e7eea2cd15c51
 2024-08-27 15:15:48 +02:00
Oksana Shliakhtun
a3c1399854 Driver with comments 
Change-Id: Ic2d35960de6b33e4d61ad1920d2416e2d5ed1ded
 2024-08-27 15:15:39 +02:00
Oksana Shliakhtun
f0eb7d95f1 Added documentation 
Change-Id: Id6e26a4c28fe080a55099cd54d0fa85c15946657
 2024-08-27 15:15:01 +02:00
Oksana Shliakhtun
c1403763f4 . 
Change-Id: If177029157edbd6123e9f41883dbb6c639a68852
 2024-08-27 15:14:52 +02:00
Oksana Shliakhtun
d38b672a9a Status and autorange implemented for AC resistane bridge 
Change-Id: I8c94660c3b76cc78886e9e074b4ce8114fbb7f9e
 2024-08-27 15:12:37 +02:00
Oksana Shliakhtun
7c96b83aff Communication with the modules for the ac resistance bridge. 
Change-Id: I1c144bf0bfc7c8c3090aa7cf3f32f1d4d046dca7
 2024-08-27 15:12:37 +02:00
Oksana Shliakhtun
c20801c8fe Driver and cfg file for ac resistance bridge 
Change-Id: I77b2294b57315fcf7d94996a2a68fcac72866710
 2024-08-27 15:12:17 +02:00
Oksana Shliakhtun
a5e698163b Frappy driver for a HP multimeter 
Change-Id: I2e9dc5131ea9a7317d69c42dd49388216e77f72f
 2024-08-27 15:12:11 +02:00
Oksana Shliakhtun
5376490a7e New driver for AC Resistance Bridge (with SIM921 modules) 
Change-Id: I2c2da421453af0f41703805092423f9b02d1f9b4
 2024-08-27 15:11:59 +02:00
Oksana Shliakhtun
9d50412a38 Haake driver 
Change-Id: Ib6aec31ada835ebfb2f8a06b119e3b8189f9f51e
 2024-08-27 15:11:48 +02:00
Oksana Shliakhtun
39dbe1149c Driver for HP multimeter 
Change-Id: I45f70758331680fb7b044d28bf0dc50781d912d3
 2024-08-27 15:11:35 +02:00
camea
a281583cd2 dil5: fix config file after change of frappy_psi/picontrol 
+ fixes in frappy_psi/picontrol.py
 2024-08-21 16:08:44 +02:00
zebra
7536454e96 frappy_psi/sea: yet another fix: BUSY after write target 
it seems update_is_running runs in parallel to write_target
and read_status can not run before write_target has finished
due to locks -> call read_status within write_target
 2024-08-20 11:39:04 +02:00
Markus Zolliker
bfbb8172e0 improve picontrol 
after suggestions from Marek (WIP)

- keep Mareks version created during Markus absence for now
- add a class with input_module (which is not a mixin)
- not 100 % tested: HasConvergence now inherits from Drivable

Change-Id: I6b3896e7c0fdaa4379d1cbc5603d43bd7a0b3a48
 2024-08-09 10:56:31 +02:00
l_samenv
258ec60b4c frappy_psi.sea: fix issue with missing BUSY after change target 
The command 'maw' in NICOS sometimes does complete immediately
instead of waiting for reaching the target. It seems this affects
only SEA drivables. The more important fix for this has to be
done in SEA. The fix here is just to improve behaviour in case
SEA would not do as expected.
 2024-08-08 16:35:28 +02:00
l_samenv
2f396e5897 frappy_psi.sea: fix mechanism to avoid ambiguous parameter names 
previous intended behaviour: when an ambiguous name appears
it is prepended by its parent node name in sea separated with
underscore (recursively). however, this was not implemented
properly and did not work.

new behaviour: when the short name of a parameter is ambigous
it is using the full path, joined by underscore
 2024-08-08 15:52:48 +02:00
sans
2c102ad38b config file for keithley 2601b source created 
fixed bug with limits in driver
 2024-07-24 17:39:14 +02:00
zebra
ffe6f3cce0 fix bug with status (assign string to tuple) 2024-07-11 16:48:42 +02:00
dmc
82c1081b69 fix issue with seadesc 
frappy run main seadesc did no longer work.
fix this
 2024-07-08 16:08:49 +02:00
l_samenv
21dae2d9ce ACM1219: add checkHWIdent 
waiting 0.5 sec before the first communication helps to start
properly

+ added usb dev names for box
 2024-07-05 10:50:47 +02:00
Paul Neves
476d2087f6 ACM1219: remove wait_before 2024-07-05 10:50:47 +02:00
Paul Neves
bb6cf9caa1 Updated the ACM1219 driver 2024-07-05 10:50:44 +02:00
Paul Neves
c3b1ce4b8c added GNU license 2024-07-05 10:50:19 +02:00
Paul Neves
e4eb5989c3 made displacement and force calibrations writable and updated capacitance channel descriptions 2024-07-05 10:49:34 +02:00
Paul Neves
48393b2332 added RP100, ACM1219, and dummy classes, and razorbillUC220T config file 2024-07-05 10:49:30 +02:00
l_samenv
9eb8f2efc8 add T forwarder for razorbill 2024-07-05 10:39:44 +02:00