 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 |
|
|
Chris Milne
|
b8e4033117
|
changed axes names
|
2017-12-09 01:27:44 +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
|
a31406896a
|
removed JF writer second mention
|
2017-12-07 11:20:51 +01:00 |
|
|
Chris Milne
|
4551a2c427
|
removed JF writer
|
2017-12-07 11:19:30 +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 |
|
|
gac-bernina (Resp.Lemke Henrik Till)
|
67a873d610
|
Back included Vince's KB descripotion
|
2017-12-02 18:59:14 +01:00 |
|
|
Da Vince
|
8d4624aac0
|
added lasershutter.py and rpr for PPRM
|
2017-12-02 18:47:30 +01:00 |
|
|
gac-bernina (Resp.Lemke Henrik Till)
|
55373fa0fc
|
Merge branch 'master' into pilot_bernina
|
2017-12-02 18:39:48 +01:00 |
|
|
gac-bernina (Resp.Lemke Henrik Till)
|
fbae576c45
|
Scan improvements
|
2017-12-02 11:35:15 +01:00 |
|
|
Da Vince
|
46a47cd7fa
|
Merge branch 'master' of https://git.psi.ch/swissfel/eco
|
2017-11-30 23:03:00 +01:00 |
|
|
Da Vince
|
aa0aa8e1c2
|
add laser shutter to eco
|
2017-11-30 22:59:53 +01:00 |
|
|
Roman Mankowsky
|
31c121e82d
|
updated lasertiming
|
2017-11-30 22:25:28 +01:00 |
|