 augustin_s
|
be7c8a52e3
|
added quick protoype for persitence
|
2021-05-10 14:58:53 +02:00 |
|
|
augustin_s
|
d79f87611d
|
update comments
|
2021-05-10 12:27:18 +02:00 |
|
|
augustin_s
|
ec47a3c791
|
split on_change_adj into on_update_adj/_abs, trigger both for dropdown event but only on_update_adj for timer event
|
2021-05-10 12:22:01 +02:00 |
|
|
augustin_s
|
c58f7459f3
|
added optional jitter to dummy adj
|
2021-05-10 12:20:32 +02:00 |
|
|
augustin_s
|
e0691dd71c
|
handle step size == 0
|
2021-05-10 11:57:13 +02:00 |
|
|
augustin_s
|
5ea9affc3b
|
update filename for repeated scans also in the scan_info
|
2021-05-09 14:32:16 +02:00 |
|
|
augustin_s
|
8a73138c01
|
always strip spaces from filenames
|
2021-03-30 17:55:07 +02:00 |
|
|
augustin_s
|
2266fc67fe
|
added timer event to update current value of selected adjustable
|
2021-03-26 13:18:55 +01:00 |
|
|
augustin_s
|
554afdd13f
|
added active_wait (default: False) to PVAdjustable
|
2021-03-26 13:14:43 +01:00 |
|
|
augustin_s
|
54bad0d5d9
|
made detectors more flexible (allow: one dict or list of strings and/or dicts)
|
2021-03-09 13:57:08 +01:00 |
|
|
augustin_s
|
9b0c8e21b2
|
distinguish between motor/delay in delaystage name
|
2021-03-08 20:32:48 +01:00 |
|
|
augustin_s
|
3897ce1cce
|
fixed oversight: forward DoubleCrystalMono name to DoubleCrystalMonoEnergy
|
2021-03-08 15:04:02 +01:00 |
|
|
augustin_s
|
d47b08dab9
|
improved logic for non-float start, stop, step in Scan (no more errors); improved PVDisplay logic if pvname is None (actually show the widget), clear callback on destroy; improved ETADisplay if one of the counts is missing or the rate is zero (show infinity)
|
2021-03-08 12:29:53 +01:00 |
|
|
augustin_s
|
ed86066985
|
take repeats into account for ETA calc
|
2021-03-04 21:42:48 +01:00 |
|
|
augustin_s
|
ba2e62a73e
|
added scan repeat feature to GUI
|
2021-03-04 21:32:10 +01:00 |
|
|
augustin_s
|
59b57f4cdc
|
added repeat feature to Scanner
|
2021-03-04 19:45:43 +01:00 |
|
|
augustin_s
|
719331bec0
|
typo
|
2021-03-03 01:08:35 +01:00 |
|
|
augustin_s
|
ab4a4fff87
|
typo
|
2021-02-28 15:00:15 +01:00 |
|
|
augustin_s
|
db4ba57a3c
|
adjusted detectors list vs. dict logic
|
2021-02-27 13:34:22 +01:00 |
|
|
augustin_s
|
66e992a0f2
|
moved json validation into json utils
|
2021-02-26 23:06:10 +01:00 |
|
|
augustin_s
|
0105e8e2e0
|
use NumpyJSONEncoder to validate params
|
2021-02-26 22:47:25 +01:00 |
|
|
augustin_s
|
c01a662dc4
|
much simpler NumpyJSONEncoder
|
2021-02-26 21:30:15 +01:00 |
|
|
augustin_s
|
d871b9c0bd
|
added NumpyJSONEncoder
|
2021-02-26 20:48:05 +01:00 |
|
|
augustin_s
|
b78d8273fa
|
moved params validation into broker client; numpy arrays are now allowed in params
|
2021-02-26 15:30:14 +01:00 |
|
|
augustin_s
|
4b45b452cc
|
fix: ndarray not json serializable
|
2021-02-25 22:32:46 +01:00 |
|
|
augustin_s
|
f6248f381e
|
fixed typo
|
2021-02-25 20:37:49 +01:00 |
|
|
augustin_s
|
818e035f41
|
removed debug print
|
2021-01-30 15:51:11 +01:00 |
|
|
augustin_s
|
a26e98b19f
|
added support for optional moving/done_move/stop PVs; wait for start, then wait for move done after put
|
2021-01-30 15:48:30 +01:00 |
|
|
augustin_s
|
2de05872f2
|
harmonized some naming
|
2020-12-12 20:17:43 +01:00 |
|
|
augustin_s
|
a8f681a71c
|
InsertItems fails for empty sequence
|
2020-12-11 18:04:18 +01:00 |
|
|
augustin_s
|
d9fe924fa5
|
detect recursive Device, warn and ignore
|
2020-12-11 14:02:53 +01:00 |
|
|
augustin_s
|
41713927dc
|
repr of Device containing Devices is nice now
|
2020-12-10 12:02:04 +01:00 |
|
|
augustin_s
|
c6380506bf
|
made status values an IntEnum; added status property and is_holding method
|
2020-12-08 16:40:56 +01:00 |
|
|
augustin_s
|
d82a2f88de
|
added _move_requested flag, adjusted waiting (for start/move done) to use/set flag correctly, added _stop method which puts 1 to STOP.PROC PV and sets flag; consider move as done when holding phase starts; made both puts wait
|
2020-12-08 15:16:57 +01:00 |
|
|
augustin_s
|
11f0aed201
|
forgot to switch Task creation to respective Adjustable method
|
2020-12-05 18:56:06 +01:00 |
|
|
augustin_s
|
75e8b0b704
|
split AlvraDCM_FEL into CoupledDoubleCrystalMonoEnergy and CoupledDoubleCrystalMono; removed unsused/dead code; renamed some variables for consistency
|
2020-12-05 18:27:08 +01:00 |
|
|
augustin_s
|
acf68c494a
|
added SimpleDevice (merges Device and SimpleNamespace) for quick Device creation
|
2020-12-05 16:31:57 +01:00 |
|
|
augustin_s
|
a57b493120
|
Merge branch 'master' of https://gitlab.psi.ch/slic/slic
|
2020-12-04 20:09:18 +01:00 |
|
|
augustin_s
|
ef9032eb51
|
clean up
|
2020-12-04 19:56:58 +01:00 |
|
|
augustin_s
|
de4720e152
|
removed useless stuff
|
2020-12-04 19:48:24 +01:00 |
|
|
augustin_s
|
b22bdfd40c
|
reorderd classes
|
2020-12-04 19:42:26 +01:00 |
|
|
augustin_s
|
e03aa58265
|
reorderd methods
|
2020-12-04 19:38:07 +01:00 |
|
|
augustin_s
|
869638ee8f
|
added some namespaces
|
2020-12-04 19:35:36 +01:00 |
|
|
augustin_s
|
57edb00330
|
removed all superfluous code already provided by Adjustable
|
2020-12-04 18:52:57 +01:00 |
|
|
augustin_s
|
101c8a8edc
|
clean up
|
2020-12-04 18:44:09 +01:00 |
|
|
augustin_s
|
3301ce4a3f
|
split Double_Crystal_Mono into DoubleCrystalMono (Device) and DoubleCrystalMonoEnergy (Adjustable)
|
2020-12-04 18:41:08 +01:00 |
|
|
augustin_s
|
f329fbd309
|
removed Double_Crystal_Mono_AramisMacro (it is a duplicate of Double_Crystal_Mono)
|
2020-12-04 18:13:19 +01:00 |
|
|
augustin_s
|
6e89f1108e
|
fixed missing function name in Double_Crystal_Mono_AramisMacro
|
2020-12-04 18:09:59 +01:00 |
|
|
augustin_s
|
e869c4da9e
|
removed duplicate EcolEnergy
|
2020-12-04 18:01:28 +01:00 |
|
|
augustin_s
|
17f9cf3813
|
removed DeviceZ (superseeded by Device)
|
2020-12-04 17:54:30 +01:00 |
|