Commit Graph

351 Commits

Author SHA1 Message Date
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
mankowsky_r 4784acb462 scan upgrades 2018-12-11 07:05:51 +01:00
htlemke a08aff3707 Update Readme.md 2018-12-01 12:49:10 +01:00
htlemke 49bb77a8a9 Update Readme.md 2018-12-01 09:31:02 +01:00
mankowsky_r 9e7d92b928 started addind swissmx 2018-11-22 17:20:27 +01:00
mankowsky_r 1888676f73 added daq , but it is not complete 2018-11-15 11:00:28 +01:00
mankowsky_r 7d9286aa0d real aliases, diffractometer class and more 0.0.2 2018-10-11 14:26:56 +02:00
htlemke 30cf15829a Update Readme.md 2018-10-06 22:57:10 +02:00
lemke_h 89b6e37a27 format 2018-10-06 22:42:48 +02:00
lemke_h 73689aadea aliases, what is it? 2018-10-06 22:42:03 +02:00
lemke_h 7e6c72869b aliases, what is it? 2018-10-06 22:38:56 +02:00
mankowsky_r c54d5baf87 Merge branch 'master' of https://github.com/paulscherrerinstitute/eco 2018-10-06 22:37:45 +02:00
mankowsky_r a465b9600d aliases 2018-10-06 22:37:15 +02:00
htlemke c929ab5164 Update Readme.md 2018-10-06 06:19:58 +02:00
htlemke f27f2fd3cf Update Readme.md 2018-10-06 06:19:29 +02:00
mankowsky_r 266235ae9d adding alias and adjustable conventions, unfinished 2018-10-02 16:25:58 +02:00
mankowsky_r 696e7eda26 scan 2018-10-02 06:14:53 +02:00
mankowsky_r cd9750c406 added ioxos daq 2018-09-28 09:55:25 +02:00
mankowsky_r 0016428b6a added ioxos daq 2018-09-28 09:55:10 +02:00