 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
|
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
|
db85e12e82
|
removed string from motor
|
2018-06-04 18:14:22 +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
|
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
|
022bf783ba
|
moved all bernina channel lists to /sf/bernina/config/channel_lists
|
2018-04-25 15:25:26 +02:00 |
|
|
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 |
|
|
Chris Milne
|
a12413a9e7
|
typo
|
2018-03-07 00:47:49 +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)
|
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
|
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
|
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
|
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 |
|
|
gac-bernina (Resp.Lemke Henrik Till)
|
fbae576c45
|
Scan improvements
|
2017-12-02 11:35:15 +01:00 |
|
 lemke_h
|
6226a39e82
|
lxt, scan
|
2017-11-30 18:19:25 +01:00 |
|
|
gac-bernina (Resp.Lemke Henrik Till)
|
102da80217
|
added lens motor, and scans
|
2017-11-29 21:23:37 +01:00 |
|
|
lemke_h
|
c9ea3dd410
|
Implemented JF scanning
|
2017-11-28 14:43:39 +01:00 |
|
|
lemke_h
|
2de58d68d5
|
First working scan
|
2017-11-25 19:22:24 +01:00 |
|
|
gac-bernina (Resp.Lemke Henrik Till)
|
14957059af
|
fix considering dirty hack for jf reader
|
2017-11-22 14:07:21 +01:00 |
|
|
Roman Mankowsky
|
31c9149918
|
Added Jungfrau and delay stage
|
2017-11-19 15:29:04 +01:00 |
|
|
Lemke Henrik Till
|
c912fe335c
|
screenshot, fixes
|
2017-11-17 21:32:31 +01:00 |
|
|
lemke_h
|
c35e8443e4
|
Merge branch 'master' of git.psi.ch:swissfel/eco
|
2017-11-17 08:05:37 +01:00 |
|
|
lemke_h
|
508e27eb5b
|
motor __call__ and startup error handling
|
2017-11-17 08:04:50 +01:00 |
|
|
gac-alvra (Resp.Milne Christopher)
|
e0612a6850
|
Merge branch 'master' of https://git.psi.ch/swissfel/eco
|
2017-11-14 15:04:18 +01:00 |
|
|
gac-alvra (Resp.Milne Christopher)
|
ce6501c131
|
added alvra.py definitions
|
2017-11-14 14:57:52 +01:00 |
|
|
lemke_h
|
e0fe1fb9af
|
added monXXX pbpsXXX modules, added hdf5 writer
|
2017-11-14 09:04:54 +01:00 |
|
|
lemke_h
|
0d3f2b62ff
|
added more components
|
2017-11-12 16:50:56 +01:00 |
|
|
lemke_h
|
27638f4c18
|
got rid of some __pycache__ stuff
|
2017-11-11 15:05:13 +01:00 |
|
|
lemke_h
|
80a864a285
|
added elog
|
2017-11-11 14:36:03 +01:00 |
|
|
Roman Mankowsky
|
a186095a20
|
Added KB.py, DCM.py, changed caget to get only relevant pixels from camera
|
2017-11-08 18:36:47 +01:00 |
|
|
Roman Mankowsky
|
9386a04ee9
|
Added missong files
|
2017-11-08 12:27:05 +01:00 |
|
|
Mankowsky Roman
|
2dce81c22f
|
Implemented GPS and xeye
|
2017-11-07 12:38:03 +01:00 |
|
|
lemke_h
|
664b2672d8
|
fist working instrument module
|
2017-11-04 21:42:22 +01:00 |
|