Commit Graph

92 Commits

Author SHA1 Message Date
Roman Mankowsky e0e3cfa134 updated lasertiming 2017-11-30 22:13:30 +01:00
Roman Mankowsky 803b4973db more scanning options 2017-11-30 21:09:59 +01:00
Da Vince 036251e2b8 Merge branch 'master' of https://git.psi.ch/swissfel/eco 2017-11-30 18:25:09 +01:00
Da Vince d2584f6c21 Information for PBPS monitors added 2017-11-30 18:23:36 +01:00
lemke_h 7bdd19e4de added lxt, scan whould work also with newst versions of jfutils 2017-11-30 18:23:26 +01:00
lemke_h ee191a2623 Merge branch 'master' of https://git.psi.ch/swissfel/eco 2017-11-30 18:21:18 +01:00
lemke_h 6226a39e82 lxt, scan 2017-11-30 18:19:25 +01:00
lemke_h 851e474ce2 fixed very stupid bug 2017-11-30 17:30:14 +01:00
lemke_h c7e86f41ac Merge branch 'master' of https://git.psi.ch/swissfel/eco 2017-11-29 22:59:45 +01:00
lemke_h 8647d1382a relative import path for detector_integration_api and jungfrau_utils 2017-11-29 22:59:38 +01:00
gac-bernina (Resp.Lemke Henrik Till) 4b68910422 fixed scanning 2017-11-29 22:57:50 +01:00
gac-bernina (Resp.Lemke Henrik Till) a04fbcb0ae fixed scanning 2017-11-29 22:55:12 +01:00
gac-bernina (Resp.Lemke Henrik Till) 81a7278dc5 added timing 2017-11-29 21:24:34 +01:00
gac-bernina (Resp.Lemke Henrik Till) 102da80217 added lens motor, and scans 2017-11-29 21:23:37 +01:00
Roman Mankowsky d4e555af0d scan 2017-11-28 16:00:23 +01:00
Roman Mankowsky a989c14bf0 added some verbosing 2017-11-28 15:13:04 +01:00
lemke_h 21c43783ff fixed merge problem with mr Manowsky 2017-11-28 14:50:35 +01:00
lemke_h ada60578a1 Implemented JF scanning 2017-11-28 14:44:19 +01:00
lemke_h c9ea3dd410 Implemented JF scanning 2017-11-28 14:43:39 +01:00
Roman Mankowsky 996d461d11 Fixed JF module, config and acquire should work 2017-11-28 13:54:17 +01:00
Roman Mankowsky e646411c54 Added waveplate as lasExp.wp 2017-11-28 11:28:06 +01:00
lemke_h 77ca162b8b Added readbacks to scan 2017-11-27 15:30:40 +01:00
lemke_h 2de58d68d5 First working scan 2017-11-25 19:22:24 +01:00
Svetina Cristian b95815b90b Added Reference laser module and to Bernina aliases. 2017-11-25 14:25:17 +01:00
Lemke Henrik Till 18b5214ff5 scanning base Class created 2017-11-25 13:36:17 +01:00
Roman Mankowsky adffe6022b started scan 2017-11-25 00:12:43 +01:00
Roman Mankowsky 2c904e8d9a slit att and fized screenshot 2017-11-24 22:50:17 +01:00
Esposito Vincent 00eefe5b17 Added target selection for pprm 2017-11-23 10:51:39 +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 06f41af5f2 Fixed a small error 2017-11-22 11:49:37 +01:00
gac-bernina (Resp.Lemke Henrik Till) 42fa085975 Merge branch 'master' of https://git.psi.ch/swissfel/eco 2017-11-22 11:03:38 +01:00
gac-bernina (Resp.Lemke Henrik Till) 0aa305a2e8 Something was done in /sf/ python folder with detectors.py 2017-11-22 11:02:51 +01:00
“Roman 3e53580597 Merge branch 'master' of git.psi.ch:swissfel/eco 2017-11-22 10:55:42 +01:00
“Roman b6ee009d14 Added get and set Bias to FE digitizer 2017-11-22 10:55:38 +01:00
Roman Mankowsky 31c9149918 Added Jungfrau and delay stage 2017-11-19 15:29:04 +01:00
lemke_h 8a73449299 fix 2017-11-18 16:48:16 +01:00
lemke_h 28ded01b03 fix 2017-11-18 16:45:14 +01:00
lemke_h 2a6c10fff2 fix 2017-11-18 16:42:39 +01:00
lemke_h f25d4f7506 Front end attenuator 2017-11-18 16:37:24 +01:00
lemke_h 3a7a47d382 recording epics cam images 2017-11-18 16:34:07 +01:00
lemke_h 6ea607bad6 pprms included 2017-11-18 16:07:11 +01:00
lemke_h b4279205c0 bs camera module 2017-11-18 02:12:49 +01:00
Lemke Henrik Till fe6edec1c3 slits 2017-11-17 23:50:00 +01:00
Lemke Henrik Till 7c60e06f31 screenshot, fixes 2017-11-17 21:41:42 +01:00
Lemke Henrik Till c912fe335c screenshot, fixes 2017-11-17 21:32:31 +01:00
Roman Mankowsky 8432d636ef Adjusted attenuator to new epics interface, motor gui() is now medium sized one 2017-11-17 16:49:22 +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) 97c3a40236 Merge branch 'master' of https://git.psi.ch/swissfel/eco
test pull from saresa-cons-03 as gac-alvra
2017-11-16 18:08:56 +01:00
lemke_h 3039e0347d fixed and extended 2017-11-15 20:48:36 +01:00