46 Commits

Author SHA1 Message Date
14d37c3e67 Handle missing channels in data 2025-06-10 14:46:18 +02:00
14d0db7fad add SPECTRUM_X to Furka 2025-05-24 17:12:20 +02:00
2267992699 bugfix 2025-04-28 14:48:01 +02:00
26998e15dd change bscache args to new bstrd version 2025-04-27 13:39:42 +02:00
100be302e9 Merge branch 'fix_bscaquisition' into 'master'
Fix bscaquisition

See merge request slic/sfbd!6
2025-04-27 12:52:06 +02:00
1d933a66ce change argument passed to baseclass Acquisition 2025-04-27 12:33:56 +02:00
a5189537bb bugfix 2025-04-27 12:01:58 +02:00
b221a7f964 Merge branch 'fix_bscaquisition' into 'master'
Fix bscaquisition

See merge request slic/sfbd!5
2025-04-27 11:21:36 +02:00
127f3ef9db Merge branch 'master' into fix_bscaquisition 2025-04-11 14:57:30 +02:00
8de87ed1a9 merged and untested 2025-04-11 14:14:51 +02:00
423e724022 minor fix 2025-04-09 17:40:19 +02:00
fa67b2fab9 Adding individual pulse ID output for bscacquisiton 2025-02-27 17:20:33 +01:00
716d1cbf2a rewrite bsacquisition with help of Sven Augustin 2025-02-11 18:33:13 +01:00
2a0c5cf049 Added functionality to read also the seed laser spectrum 2025-02-07 17:29:59 +01:00
f5b6f29efc changed bsacquisition to avoid asigning an array to an element of an array with scalar elements 2025-02-07 15:23:40 +01:00
68cd4d5633 added pvcombination class but is no longer needed. can be deleted 2025-02-06 12:03:21 +01:00
52e126c1af Adding an adjustable instance which combines a set of normal pvadjustables to a new adjustable class PVCombiAdjustable 2025-02-05 17:36:28 +01:00
bca4098438 Corrected indexing when saving scans 2025-02-05 09:21:09 +01:00
964da0a16f add new class for simultaneous acquisition of PSSS and gas detector values 2025-01-24 18:41:31 +01:00
f2c07f0c98 Merge branch 'tmp' into 'master'
status 2024-12-03

See merge request slic/sfbd!4
2024-12-03 17:33:46 +01:00
36b7a2980a added new files 2024-12-03 17:33:04 +01:00
5e06e49c45 status 2024-12-03 2024-12-03 17:27:53 +01:00
01be4a5203 Merge branch 'philipp-dev' into 'master'
remove daq of gas detector pvs

See merge request slic/sfbd!3
2024-12-03 17:24:09 +01:00
e603069ffd remove daq of gas detector pvs 2024-12-03 17:17:03 +01:00
26eebc650b updating snapshot and loading datasets 2024-09-11 17:06:10 +02:00
24cbccb6a6 Added routines to get only the PVs from snapshot file and to get the data by these PVS. This avoids crashed of too many files open when used often 2024-06-27 14:49:05 +02:00
d1fb0b3462 Merge branch 'dev' 2024-06-27 09:27:16 +02:00
ba405e6967 Support for ZMQ 2024-06-27 09:26:14 +02:00
a07f1bcf42 Merge branch 'feature/acquire_gas_detector_with_spectra' into 'master'
new spectralanalysis with gas detector readings

See merge request slic/sfbd!2
2024-06-27 09:05:14 +02:00
2906c9cc44 rewrote spectralanalysis. Needs update of SpectralAnalysis repo 2024-06-26 18:34:15 +02:00
6fa15dd9d6 Merge branch 'dev' into 'master'
Update Master with a functional version of sfbd

See merge request slic/sfbd!1
2024-01-10 09:12:36 +01:00
36eacba046 Corrected the ZMQ base class inherited by the ServerBase Class 2024-01-09 11:21:37 +01:00
a0b5ce4c58 Adding server modules 2024-01-09 10:47:51 +01:00
4ed4630b8d After debugging the dispersion tool during machine development shift 2023-08-17 13:53:05 +02:00
fff0c81070 Debugging dispersion and xtcav app plugins 2023-07-26 13:32:43 +02:00
25e717e132 Initial debug of slic scan for the dispersion tool 2023-07-25 09:20:43 +02:00
10c7b37b99 Modified BSCAcquisition, so that the Cache is an argument of the function _acquire 2023-07-07 11:59:55 +02:00
0c928a8bb1 Improved snapshot interface with saving snapshot files in the OP configuration. Added app support for stabilizing XTCAV. Added a BSacquisition based on BSCache 2023-07-05 09:16:18 +02:00
a54abd383e Debug Dispersion measurement and added first support for XTCAV stabilizer 2023-06-16 16:58:56 +02:00
dc5df0ca2a Support for various app and slic wrapper 2023-06-13 14:18:09 +02:00
f22a17852c Added support for adaptive orbit feedback and spectral analysis 2023-05-31 11:57:13 +02:00
b82b023f33 Filling template for the interface module (loading, saving, elog etc) 2023-05-23 16:39:27 +02:00
cb3a2ba501 Added root level __init__py 2023-02-22 09:17:36 +01:00
80d91d89f2 Initial Commit 2023-02-22 09:14:40 +01:00
6bb8abca54 added ignore list 2023-02-20 22:35:21 +01:00
66dc8beeea Initial commit 2023-02-20 21:28:33 +00:00