Commit Graph

56 Commits

Author SHA1 Message Date
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
lemke_h 234c913f24 fixed and extended 2017-11-15 20:43:57 +01:00
Lemke Henrik Till f73c0126b0 Added data dump from data buffer 2017-11-14 18:47:33 +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 8c4685c647 bug fizes, added PIPS diode as detDio 2017-11-14 12:21:34 +01:00
lemke_h dd5e38118b permissions issues 2017-11-14 09:21:20 +01:00
lemke_h 46d1e58ade permissions issues 2017-11-14 09:20:09 +01:00
lemke_h 6736abaafd added missing file 2017-11-14 09:16:01 +01:00
lemke_h e0fe1fb9af added monXXX pbpsXXX modules, added hdf5 writer 2017-11-14 09:04:54 +01:00
lemke_h a56a826b4a fixed screenshot of windows 2017-11-13 22:33:56 +01:00
lemke_h ae83578f32 made the epics enum wrapper working and put in a PBPS module (without diodes yet) 2017-11-13 22:28:27 +01:00
Roman Mankowsky 4055fba7e7 Added Attenuator 2017-11-13 18:56:11 +01:00
Roman Mankowsky 718cf90d3c Did something on elog 2017-11-13 15:06:52 +01:00
Roman Mankowsky ee16e02012 Did something? 2017-11-13 14:59:56 +01:00
Roman Mankowsky e919dd6c9e Added get_MoveDone function to motors.py, which returns .DMOV value = 1: move done = 0: still moving 2017-11-13 13:16:29 +01:00
Roman Mankowsky d674965a3c Added empty files to /loptics 2017-11-13 10:50:27 +01:00
Roman Mankowsky 3d4f157489 Added gui() function to camera in detectors.py 2017-11-13 10:49:33 +01:00
Roman Mankowsky 861ac3c0de Changed the get_current_value function in devices_general/motors.py to return the readback value (.RBV) instead of the value (.VAL) of the PV 2017-11-13 10:01:37 +01:00
lemke_h 89d5438926 added empty file 2017-11-12 19:38:30 +01:00
lemke_h d8fe2462ac edit gitignore 2017-11-12 16:52:03 +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 51d47e1a6e added .gitignore 2017-11-11 15:02:19 +01:00
lemke_h 8537ec89b9 got rid of some __pycache__ stuff 2017-11-11 14:58:58 +01:00
lemke_h 80a864a285 added elog 2017-11-11 14:36:03 +01:00
Roman Mankowsky 135611e7d4 Typing motor now gives its position 2017-11-09 17:10:02 +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
Roman Mankowsky 6b45b72e20 Added steering mirror to /loptics and /ldiagnostics folders 2017-11-08 12:25:28 +01:00
Mankowsky Roman 2dce81c22f Implemented GPS and xeye 2017-11-07 12:38:03 +01:00
lemke_h ffb8c375e1 fist working instrument module 2017-11-04 21:42:49 +01:00
lemke_h 664b2672d8 fist working instrument module 2017-11-04 21:42:22 +01:00
lemke_h 438e68da85 fist working instrument module 2017-11-04 21:41:41 +01:00
lemke_h 0646d5d57d more aliases and starting devices 2017-10-31 18:23:52 +01:00
lemke_h 2e4d0ffcad aliases 2017-10-30 17:54:31 +01:00
lemke_h f79c635667 minor 2017-10-30 14:46:32 +01:00