Commit Graph

415 Commits

Author SHA1 Message Date
mankowsky_r 222ea032ff added hexapod adjustables 2019-07-17 06:17:51 +02:00
lemke_h 8f99c1c9ca acquire for Pv Streams 2019-07-17 03:07:55 +02:00
lemke_h d936524c8a startup tweaks 2019-07-16 11:12:25 +02:00
mankowsky_r 0519848be7 event master and others 2019-07-16 11:11:27 +02:00
mankowsky_r 152debee61 Merge branch 'bernina-op' of https://github.com/paulscherrerinstitute/eco into bernina-op 2019-07-15 09:34:33 +02:00
lemke_h c953774c07 slits and bl 2019-07-15 09:34:08 +02:00
Dmitry Ozerov 5ae5df377f quick fix to have run_name (as filename) for statistics tab in visualisation 2019-07-12 15:32:49 +02:00
mankowsky_r 54ddb44003 fixes in startup and adjustables and bernina 2019-07-10 18:32:42 +02:00
lemke_h db4d04de07 added slit posgap 2019-07-09 12:32:09 +02:00
mankowsky_r 2fc0ce1c8d corrected delay stage directions in bernina 2019-07-04 21:51:42 +02:00
mankowsky_r d7313a0380 bugfix for the attenuator adjustable 2019-06-30 07:29:13 +02:00
mankowsky_r 727f4f338b first attempt to make attenuator adjustable, some name parameter in monochromator, not clear why this was needed. 2019-06-29 07:11:05 +02:00
mankowsky_r 071b119da7 Merge branch 'bernina-op' of https://github.com/paulscherrerinstitute/eco into bernina-op 2019-06-26 14:25:40 +02:00
lemke_h 89b3a3743d thread alive check fix in Changer 2019-06-26 14:24:37 +02:00
Henrik Lemke 8dd2ae357b adjusting requirements, more to be done 2019-06-26 08:19:28 +02:00
mankowsky_r 5cb941c775 upstream propagation in aliases included 2019-06-25 14:21:33 +02:00
mankowsky_r f78c661716 started camera object 2019-06-24 15:55:15 +02:00
mankowsky_r 46b16b5f3e Merge branch 'bernina-op' of https://github.com/paulscherrerinstitute/eco into bernina-op 2019-06-21 23:40:12 +02:00
mankowsky_r 6e2aa3acc5 hack for simultaneous collection of dia and bs dump 2019-06-21 23:39:48 +02:00
mankowsky_r c3d33118fc bug in motor set limits 2019-06-21 23:37:56 +02:00
mankowsky_r 86968da6da bugfixes 2019-06-21 22:10:16 +02:00
mankowsky_r 6d195db2cb reworking event timing, start 2019-06-21 14:59:38 +02:00
lemke_h 96eac615da typo fix 2019-06-07 12:32:37 +02:00
lemke_h ef9c47d3d4 fixed call method in spec convenience 2019-06-07 11:55:52 +02:00
mankowsky_r 68595906d4 reformatting 2019-06-07 10:46:30 +02:00
lemke_h a5c5f0b227 started working on better slits using adjustables 2019-06-07 10:44:54 +02:00
lemke_h 4e5d853930 added update moves, to MotorRecord so far. also added value callbacks there 2019-06-07 09:04:58 +02:00
lemke_h 0e089b6796 added range repr to MotorRecord 2019-06-06 23:05:04 +02:00
lemke_h af96e52685 started working on update change 2019-06-06 20:01:10 +02:00
mankowsky_r ca54d9d983 reformatted 2019-06-04 15:10:20 +02:00
mankowsky_r 140eeed9a5 added counters keyword to scan.Scans scans 2019-06-04 14:55:30 +02:00
lemke_h a4d18879ab fixed bsdaq 2019-06-04 14:43:08 +02:00
mankowsky_r 8d29532d57 fixed file naming in bs_daq 2019-06-04 14:39:36 +02:00
lemke_h 915ba4e837 Merge branch 'master' into bernina-op 2019-06-04 14:14:42 +02:00
lemke_h a38f6641a9 fixed bsdaq, finally added the screenpanel module 2019-06-04 14:12:26 +02:00
mankowsky_r efe64ae362 changing the lxtt directions 2019-06-04 10:26:17 +02:00
mankowsky_r c9c77338a9 added a2scan of 2 variables required for this experiment and added Id to delay stages, which is required for scans 2019-06-01 18:29:17 +02:00
lemke_h 344966ed1b Merge branch 'bernina-op' of https://github.com/paulscherrerinstitute/eco into bernina-op 2019-05-31 21:23:19 +02:00
lemke_h c1c30c15a2 fixed the bs_daq module, adjusted to way the new bsread is doing stuff, channellist in bernina was changed to default and default_bs 2019-05-31 21:22:26 +02:00
mankowsky_r ac717411af fix at bernina xrd 2019-05-31 21:16:38 +02:00
lemke_h ec6c29f496 adjusted implementation of cameras 2019-05-27 18:55:52 +02:00
lemke_h 2a83c49307 Merge branch 'bernina-op' 2019-05-27 18:20:45 +02:00
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 3cb525c090 Merge branch 'bernina-op' 2019-05-26 21:12:58 +02:00
lemke_h dad5883cb2 Merge branch 'dev' 2019-05-26 21:12:28 +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