Commit Graph

213 Commits

Author SHA1 Message Date
Chris Milne 0affd0a847 updated to generic laser alias 2018-06-25 19:52:36 +02:00
Chris Milne 71d3e11e45 added palm delay lines 2018-06-25 19:34:49 +02:00
Chris Milne 8932d1b401 missing quote 2018-06-25 15:37:34 +02:00
Chris Milne fe8a27edcd edited psen module 2018-06-25 15:19:18 +02:00
Chris Milne c2f095d581 Merge remote-tracking branch 'origin/diverse' 2018-06-25 15:01:09 +02:00
gac-alvra (Resp.Milne Christopher) a5d14ca59e added psen module 2018-06-22 18:29:27 +02:00
mankowsky_r b22e1f7987 Revert "Revert "diverse""
This reverts commit 41bf08598b.
2018-06-22 17:10:07 +02:00
Chris Milne 8d70442edb Merge remote-tracking branch 'origin/master' 2018-06-22 17:09:31 +02:00
mankowsky_r 41bf08598b Revert "diverse"
This reverts commit 8e3741b2d0.
2018-06-22 17:09:08 +02:00
Chris Milne 49cb67e306 updated DIAClient to match bernina 2018-06-22 14:06:38 +02:00
Chris Milne a4c0c25db0 typo 2018-06-22 13:21:49 +02:00
Chris Milne 96f9661393 remove ioxos (Alvra) 2018-06-22 13:20:53 +02:00
Chris Milne a5769daf2c typo 2018-06-22 13:18:10 +02:00
Chris Milne 63eca76e2c updates from bernina into alvra 2018-06-22 13:14:54 +02:00
mankowsky_r 8e3741b2d0 diverse 2018-06-12 10:27:09 +02:00
mankowsky_r 07a67ad393 bugfix KB alias ALVRA - linked vertical and horizontal KBs to the correct class 2018-06-09 16:12:04 +02:00
mankowsky_r bbe8015e72 bugfix KBs - Removed KB class and replaced with KBhor and KBver class 2018-06-09 15:55:39 +02:00
mankowsky_r dd00baea97 bugfix 2018-06-08 19:28:05 +02:00
mankowsky_r 8070e75232 Merge branch 'master' of https://git.psi.ch/swissfel/eco 2018-06-08 15:54:09 +02:00
mankowsky_r 4d4a53efdc mono with ecol scan, callable scan info is possible. 2018-06-08 15:53:41 +02:00
Chris Milne a2ec145ea5 removed PSCRs 2018-06-06 17:50:42 +02:00
Chris Milne e5d3f11408 ignore .DS_Store 2018-06-06 17:32:44 +02:00
Chris Milne 679be5eb41 edits to add devices 2018-06-06 17:26:45 +02:00
gac-alvra (Resp.Milne Christopher) 285a9487ea commit from Alvra including local changed made for XTG experiment (should only break Alvra :) 2018-06-05 17:07:09 +02:00
Chris Milne cc49644d42 back to old way 2018-06-04 19:01:41 +02:00
Chris Milne 5f4a093feb test x,y,z 2018-06-04 18:59:18 +02:00
Chris Milne 3d9db20088 wrong channel ! 2018-06-04 18:52:06 +02:00
Chris Milne eff354bc78 added as_string=True 2018-06-04 18:50:17 +02:00
Chris Milne 937f38e453 fixed typo 2018-06-04 18:43:43 +02:00
Chris Milne 757e8a846d added operating mode set point 2018-06-04 18:42:12 +02:00
Chris Milne 8c5f7cc51d added table status 2018-06-04 18:37:52 +02:00
Chris Milne 067d8a01b2 switched back to strings 2018-06-04 18:29:48 +02:00
Chris Milne ea40a55cdd more table stuff 2018-06-04 18:21:55 +02:00
Chris Milne db85e12e82 removed string from motor 2018-06-04 18:14:22 +02:00
Chris Milne fc319575f9 added Prime table coordinated motion channels 2018-06-04 18:08:34 +02:00
mankowsky_r e91b076bbc etc 2018-06-02 20:53:36 +02:00
lemke_h b4c223a473 Merge branch 'master' of https://git.psi.ch/swissfel/eco 2018-05-31 16:13:29 +02:00
lemke_h 2fa5cfd1eb fixed sign error in relative limit setter 2018-05-31 16:12:56 +02:00
mankowsky_r f07012825f fixed exp config, now reads from /sf/bernina/config/exp/exp_config.json 2018-05-30 15:35:12 +02:00
mankowsky_r 8bdbe814ea changes 3rd pilot 2018-05-29 19:48:53 +02:00
mankowsky_r e1a7f853d5 started hexapod module with helpers 2018-05-27 17:36:56 +02:00
mankowsky_r ec5c10a859 psen stuff 2018-05-27 16:58:07 +02:00
mankowsky_r 9f98c7a402 added some bsdaq channel checkers 2018-05-22 16:04:24 +02:00
mankowsky_r 0e336911bf changed bugs due to fast forward, data/raw 2018-05-09 20:26:49 +02:00
mankowsky_r e76774a6db added files 2018-04-25 16:27:07 +02:00
mankowsky_r ce3405a5fe moved delay stage class definition to devices_general and added palm class in foler /timing 2018-04-25 16:25:00 +02:00
mankowsky_r 022bf783ba moved all bernina channel lists to /sf/bernina/config/channel_lists 2018-04-25 15:25:26 +02:00
lemke_h 9fc3734350 additional materials 2018-04-12 10:56:49 +02:00
lemke_h 99a8184f1f additional materials 2018-04-11 18:22:50 +02:00
lemke_h b85084b891 Added xsim simulation tools for xrays 2018-04-11 18:00:47 +02:00