Bernina/eco
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
227 Commits 5 Branches 3 Tags
f131243eeea27c0158e38dfd036689ea661e8dcd
Commit Graph
73 Commits
Author SHA1 Message Date
Chris Milne f131243eee tweaks 2018-06-26 11:25:15 +02:00
Chris Milne c37e4bec8f palm 2018-06-26 11:22:14 +02:00
Chris Milne d2a6f2f2e4 palm 2018-06-26 11:10:42 +02:00
Chris Milne 32a854da21 one more try 2018-06-25 23:45:11 +02:00
Chris Milne 23759b4697 las 2018-06-25 23:35:58 +02:00
Chris Milne dc688e8e39 test 2018-06-25 23:29:02 +02:00
Chris Milne e397b1fab3 edits 2018-06-25 23:17:43 +02:00
Chris Milne e7ff72772f typo 2018-06-25 21:44:08 +02:00
Chris Milne 062c7d528f updates to aliases 2018-06-25 21:33:36 +02:00
Chris Milne 89b4ddb6c1 laser delay lines 2018-06-25 21:03:04 +02:00
Chris Milne 20637b42b4 fix 2018-06-25 20:04:02 +02:00
Chris Milne b8515abc5c fix 2018-06-25 19:59:50 +02:00
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 63eca76e2c updates from bernina into alvra 2018-06-22 13:14:54 +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
Chris Milne a2ec145ea5 removed PSCRs 2018-06-06 17:50:42 +02:00
Chris Milne 679be5eb41 edits to add devices 2018-06-06 17:26:45 +02:00
mankowsky_r 8bdbe814ea changes 3rd pilot 2018-05-29 19:48:53 +02:00
mankowsky_r ec5c10a859 psen stuff 2018-05-27 16:58: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 9872e00b43 lots of tweaks 2018-03-17 08:53:30 +01:00
gac-bernina (Resp.Lemke Henrik Till) 42f2e08c7b Fixed Bernina gps addresses which have all changed in epics. GPS is still giving controller errors 2018-03-06 16:09:39 +01:00
gac-bernina (Resp.Lemke Henrik Till) 16a0e72aba Added Bernina beam steering (las.eos, las.thz, las.par) 2018-03-06 15:46:33 +01:00
gac-alvra (Resp.Milne Christopher) 21761e10db Merge branch 'master' of https://git.psi.ch/swissfel/eco 
Conflicts:
	xoptics/dcm.py

likely breaking something, committing from gac-alvra on saresa-cons-03
 2018-02-28 18:50:52 +01:00
gac-alvra (Resp.Milne Christopher) 511e668381 updated Alvra aliases and DCM class 2018-02-28 18:46:57 +01:00
Roman Mankowsky 8666b9e67a Changed Delay stage class, which takes now a stage as input and changed time from picoseconds to seconds. Added Ioxos DAQ. Added Ioxos scan (scansIoxos). The default channels for the Ioxos is in /sf/bernina/config/default_channels/default_channel_list_ioxos. gps is still failing to load 2018-02-28 17:43:10 +01:00
beck_m f24476d26a Combined SmarAct/Motor Stages and bugfixes 2017-12-16 08:06:22 +01:00
beck_m a1c4425454 [added SmarAct support and aliases] 2017-12-14 00:02:35 +01:00
Chris Milne 8bd209ba5c JF fixes 2017-12-13 20:50:17 +01:00
Chris Milne 95ebcb3c5a Auto stash before merge of "master" and "origin/master" 2017-12-13 20:39:22 +01:00
gac-alvra (Resp.Milne Christopher) 7addd41e18 working with JF components 2017-12-10 20:47:33 +01:00
Chris Milne eedfe454fa duplicated timing and lasertiming 2017-12-09 20:27:06 +01:00
Chris Milne 18e2c71cef re-named microscope 2017-12-09 01:53:27 +01:00
Chris Milne df0561d14d added microscope foc/zoom 2017-12-09 01:47:00 +01:00
Chris Milne 0fd53c3d20 added prime owis and table 2017-12-09 01:38:21 +01:00
Chris Milne 19684bb783 removed PIPS and JF again 2017-12-09 01:28:54 +01:00
Chris Milne 07ed48b6f4 missing comma 2017-12-09 01:25:37 +01:00
Chris Milne b7f0fd612f added Huber 2017-12-09 01:22:38 +01:00
Chris Milne 2280666023 fixed comment 2017-12-07 11:15:47 +01:00
Chris Milne 6bf83486f3 removed expt PBPS & JF 
don't exist yet
 2017-12-07 11:10:42 +01:00
Chris Milne c29ca93d47 bernina dupes 
edited aliases and instruments to reflect changes from bernina to alvra, much will be broken here due to JF and BS data
 2017-12-06 23:20:05 +01:00
Chris Milne 9ab44c317a fixed comma 2017-12-04 16:27:01 +01:00
Chris Milne 397923efb1 added Alvra aliases 
covering everything from the front-end through to the KB mirrors.
 2017-12-04 16:22:28 +01:00
gac-bernina (Resp.Lemke Henrik Till) 0f9f2ecae3 Back included Vince's alias 2017-12-02 19:02:08 +01:00
Roman Mankowsky e646411c54 Added waveplate as lasExp.wp 2017-11-28 11:28:06 +01:00
Svetina Cristian b95815b90b Added Reference laser module and to Bernina aliases. 2017-11-25 14:25:17 +01:00