 lemke_h
|
cdc01437ff
|
adjusted implementation of cameras, added an alias safe append_object_to_object method in aliases
|
2019-05-27 18:17:49 +02:00 |
|
|
lemke_h
|
8c8cf3c0af
|
some adjustments to new tools on profile monitors and intensity monitors
|
2019-05-26 11:33:50 +02:00 |
|
|
lemke_h
|
7c649a49e3
|
implemented compensated delay stage in bernina
|
2019-05-26 10:16:39 +02:00 |
|
|
lemke_h
|
0e58d93e0b
|
added delay stages, fixed spec convenience bugs
|
2019-05-25 22:22:37 +02:00 |
|
|
lemke_h
|
db2d083ab3
|
added new virtual adjustable and according new way to do delay stages.
|
2019-05-24 16:35:24 +02:00 |
|
 “Roman
|
950bdc3381
|
added smar_config to config file. smaract stages are added to las by looping through the smar_config dict (smar_name,smar_address),e.g. {'thz_z':'-ESB1'}
|
2019-05-24 09:53:52 +02:00 |
|
|
“Roman
|
caee42e77d
|
XRD setup can now be configured in the config file and the components are loaded accordingly
|
2019-05-23 09:26:47 +02:00 |
|
|
“Roman
|
7d58422551
|
added default_file_path variable to dia, which is set to None (has no effetc but was missing and causing issues with file paths of the other DAQs). renamed ioxos_daq to epics_daq. changed epics_daq h5 file format to match bsread format for compatibility with escape. changed default folder for data and scan data of epics_daq to: epics_daq/ + scan_info/ and scan_data/ for scans. minor fixes of epics DAQ
|
2019-05-11 21:08:27 +02:00 |
|
|
lemke_h
|
0622849cd7
|
got bsdaq to work again and added to bernina config (with two channellists)
|
2019-05-10 15:27:41 +02:00 |
|
|
lemke_h
|
83ee606628
|
added fix to attenuator
|
2019-05-10 14:09:19 +02:00 |
|
|
lemke_h
|
52f4dc4b16
|
pulse picker extension
|
2019-05-08 15:43:58 +02:00 |
|
|
lemke_h
|
f86494580b
|
Merge branch 'dev' into bernina-op
|
2019-05-08 13:07:52 +02:00 |
|
|
lemke_h
|
d69f6fcd20
|
fix bug in sequencer
|
2019-05-08 13:06:47 +02:00 |
|
|
“Roman
|
fea189a551
|
fixed the directory permission assignment after creation of scan_info (chmod(775) -> chmod(0o775)) in scan.py
|
2019-05-07 19:14:34 +02:00 |
|
|
lemke_h
|
3e41e67387
|
Merge branch 'dev' into bernina-op
|
2019-05-06 21:11:24 +02:00 |
|
|
lemke_h
|
0f7d8d6f05
|
bug in size determination PV stream
|
2019-05-06 21:06:55 +02:00 |
|
|
lemke_h
|
0756b28ac5
|
Added a Pv stream detector prototype, some cleanup
|
2019-05-06 09:03:58 +02:00 |
|
|
lemke_h
|
4009fd2126
|
added a enum PV adjustable
|
2019-05-03 16:35:39 +02:00 |
|
|
lemke_h
|
5c9d57bc2b
|
fixed merge conflicts with dev
|
2019-05-03 11:46:15 +02:00 |
|
|
lemke_h
|
86bfaf16dc
|
merge to dev
|
2019-05-03 11:21:54 +02:00 |
|
|
lemke_h
|
90c1e7e0fb
|
added timing master and cta to bernina
|
2019-05-03 09:35:58 +02:00 |
|
|
lemke_h
|
c082d5c545
|
moved Pv adjustable to adjustable
|
2019-05-01 15:01:17 +02:00 |
|
|
lemke_h
|
78b4d2e45e
|
fixed dia, update to bernins-op and fix in latest pedestal determination
|
2019-05-01 14:43:25 +02:00 |
|
|
lemke_h
|
9a2e5b75de
|
fixed config bernina to new configuratoin object
|
2019-05-01 14:21:17 +02:00 |
|
|
lemke_h
|
691cbf8e86
|
little fixes, attenuator
|
2019-04-30 21:02:32 +02:00 |
|
|
lemke_h
|
6302c1d49e
|
started on cta implementation
|
2019-04-30 15:53:19 +02:00 |
|
|
lemke_h
|
35c8bfa3b5
|
started on cta implementation
|
2019-04-30 10:40:39 +02:00 |
|
 mankowsky_r
|
e790ecc550
|
changed attenuator minimum energy
|
2019-03-19 16:13:10 +01:00 |
|
|
lemke_h
|
a56e2f74d6
|
ipython config tab completion instead dummy class
|
2019-03-18 16:05:11 +01:00 |
|
|
mankowsky_r
|
f46cfc2e06
|
fixes in automatic pedestal lookup
|
2019-03-18 15:57:24 +01:00 |
|
|
lemke_h
|
5bc60a0e3c
|
test
|
2019-02-21 18:44:32 +01:00 |
|
|
lemke_h
|
0805bf8051
|
test
|
2019-02-21 18:42:09 +01:00 |
|
|
mankowsky_r
|
1bb61cc74a
|
fixes and autopedestal find
|
2019-02-21 18:28:22 +01:00 |
|
|
mankowsky_r
|
91a44729ca
|
dia address change
|
2019-02-14 23:13:15 +01:00 |
|
|
mankowsky_r
|
802fab812b
|
fixes during pathak exp
|
2019-01-30 13:03:41 +01:00 |
|
|
mankowsky_r
|
f27af35cff
|
added devices_general.pv_adjustable, sigma class in endstations.bernina_cameras as well as cams142_C1 to the aliases
|
2019-01-25 18:05:21 +01:00 |
|
|
lemke_h
|
6797206dde
|
Merge branch 'master' of https://github.com/paulscherrerinstitute/eco
|
2018-12-27 21:41:00 +01:00 |
|
|
lemke_h
|
b8d4a0292b
|
startup and more
|
2018-12-27 21:40:56 +01:00 |
|
|
mankowsky_r
|
7ffde547e5
|
Merge branch 'master' of https://github.com/paulscherrerinstitute/eco
|
2018-12-27 21:34:08 +01:00 |
|
|
mankowsky_r
|
d0e6ac1034
|
added pulse picker
|
2018-12-27 21:29:30 +01:00 |
|
|
mankowsky_r
|
9ed1e522b6
|
bugfixes
|
2018-12-18 00:24:24 +01:00 |
|
|
lemke_h
|
2691e5feff
|
evr little advances
|
2018-12-16 22:48:20 +01:00 |
|
|
lemke_h
|
ddd749011c
|
evr little advances
|
2018-12-16 22:45:57 +01:00 |
|
|
mankowsky_r
|
643170b6a5
|
fixed some stuff in dia, which was apparently cleaned from some older version.
|
2018-12-16 20:52:34 +01:00 |
|
|
mankowsky_r
|
b7f101fff5
|
fixes in dia
|
2018-12-16 08:07:20 +01:00 |
|
|
mankowsky_r
|
ad6a4c02ed
|
DIA has moved to acquisition and been cleaned up a bit.
|
2018-12-13 20:05:08 +01:00 |
|
|
mankowsky_r
|
84ba4a0ff7
|
added checker
|
2018-12-13 07:52:52 +01:00 |
|
|
mankowsky_r
|
ea92c1ae80
|
evr conditions
|
2018-12-12 18:12:14 +01:00 |
|
|
mankowsky_r
|
52699918e0
|
event timing first add
|
2018-12-12 17:49:10 +01:00 |
|
|
mankowsky_r
|
4b37b0687c
|
event timing first add
|
2018-12-12 17:47:42 +01:00 |
|