 mankowsky_r
|
3edbcb3ebf
|
started lazy import
|
2018-03-20 15:55:42 +01:00 |
|
|
mankowsky_r
|
9872e00b43
|
lots of tweaks
|
2018-03-17 08:53:30 +01:00 |
|
|
mankowsky_r
|
246d88bbce
|
move_and_wait for dcm
v0.0.1
|
2018-03-08 16:24:37 +01:00 |
|
|
mankowsky_r
|
4a4970f07d
|
move_and_wait for dcm
|
2018-03-08 16:22:26 +01:00 |
|
|
mankowsky_r
|
7e6f8fe59a
|
move_and_wait for dcm
|
2018-03-08 16:16:56 +01:00 |
|
|
mankowsky_r
|
191806c218
|
move_and_wait for dcm
|
2018-03-08 16:15:57 +01:00 |
|
|
mankowsky_r
|
2f96bf1406
|
move_and_wait for dcm
|
2018-03-08 16:09:22 +01:00 |
|
|
mankowsky_r
|
94f96c6054
|
move_and_wait for dcm
|
2018-03-08 16:06:33 +01:00 |
|
|
mankowsky_r
|
afc3a5c204
|
move_and_wait for dcm
|
2018-03-08 16:05:19 +01:00 |
|
|
mankowsky_r
|
0a72a0d705
|
move_and_wait for dcm
|
2018-03-08 16:02:30 +01:00 |
|
|
mankowsky_r
|
29a0a991ec
|
move_and_wait for dcm
|
2018-03-08 15:59:16 +01:00 |
|
|
mankowsky_r
|
69b2efb438
|
move_and_wait for dcm
|
2018-03-08 15:53:16 +01:00 |
|
|
mankowsky_r
|
1a5adca956
|
Changed ioxosDAQ, now uses callbacks
|
2018-03-07 19:56:52 +01:00 |
|
 Chris Milne
|
a12413a9e7
|
typo
|
2018-03-07 00:47:49 +01:00 |
|
|
gac-alvra (Resp.Milne Christopher)
|
311c5453b8
|
fixed stationMessage
|
2018-03-07 00:45:28 +01:00 |
|
|
Chris Milne
|
ba5f44634b
|
Auto stash before merge of "master" and "origin/master"
|
2018-03-07 00:45:14 +01:00 |
|
|
gac-alvra (Resp.Milne Christopher)
|
1fb67ddd3d
|
added utility to post to station message panel
|
2018-03-06 23:47:40 +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 |
|
|
Chris Milne
|
adfed8b1b6
|
more dcm
|
2018-03-06 01:36:00 +01:00 |
|
|
Chris Milne
|
e97d8dda1b
|
dcm edits
|
2018-03-06 01:32:00 +01:00 |
|
|
gac-alvra (Resp.Milne Christopher)
|
99abac517b
|
modified dcm
|
2018-03-01 18:32:56 +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
|
1e1a12d037
|
Merge branch 'master' of https://git.psi.ch/swissfel/eco
|
2018-02-28 17:43:50 +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 |
|
|
Chris Milne
|
02c03eecff
|
dcm
|
2018-02-26 18:40:23 +01:00 |
|
|
Chris Milne
|
b8b0bfbf6e
|
dcm
|
2018-02-26 16:46:18 +01:00 |
|
|
Chris Milne
|
8c4376b708
|
edited dcm and alvra_prime
|
2018-02-26 16:30:51 +01:00 |
|
|
Roman Mankowsky
|
abb44c036b
|
Merge branch 'master' of https://git.psi.ch/swissfel/eco
|
2018-02-23 16:35:27 +01:00 |
|
|
Roman Mankowsky
|
59d8a5e9ca
|
Added first version of Delay stage class, currently has PV address of motor as input should be changed to motor as input to be more general
|
2018-02-23 16:34:53 +01:00 |
|
|
Chris Milne
|
f7e47129f2
|
Alvra mono
|
2018-02-23 13:29:08 +01:00 |
|
|
Chris Milne
|
48ba7d5e28
|
edited Alvra mono
changed from PV to MotorRecord
|
2018-02-23 13:24:30 +01:00 |
|
|
Chris Milne
|
94bca1c68e
|
Merge remote-tracking branch 'origin/master'
|
2018-01-26 09:03:26 +01:00 |
|
|
Chris Milne
|
6a2a5657f3
|
stop tracking .DS_store
|
2018-01-05 15:54:02 +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
|
03435976ff
|
removed scansJF
|
2017-12-13 20:47:03 +01:00 |
|
|
Chris Milne
|
59f5a40ec7
|
working on scansJF
|
2017-12-13 20:45:06 +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)
|
b3ff899960
|
update the alvra instruments and aliases
|
2017-12-13 20:33:56 +01:00 |
|
|
gac-alvra (Resp.Milne Christopher)
|
7addd41e18
|
working with JF components
|
2017-12-10 20:47:33 +01:00 |
|
|
Chris Milne
|
16fb988527
|
changed another instance of bernina laser timing
|
2017-12-09 20:47:24 +01:00 |
|
|
Chris Milne
|
eedfe454fa
|
duplicated timing and lasertiming
|
2017-12-09 20:27:06 +01:00 |
|
|
Chris Milne
|
e08171a4d5
|
didn't save the files
|
2017-12-09 01:55:10 +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 |
|