Commit Graph

52 Commits

Author SHA1 Message Date
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
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 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 eedfe454fa duplicated timing and lasertiming 2017-12-09 20:27:06 +01:00
gac-bernina (Resp.Lemke Henrik Till) fbae576c45 Scan improvements 2017-12-02 11:35:15 +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 6226a39e82 lxt, scan 2017-11-30 18:19:25 +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) 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
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
lemke_h 2de58d68d5 First working scan 2017-11-25 19:22:24 +01:00
Lemke Henrik Till 18b5214ff5 scanning base Class created 2017-11-25 13:36:17 +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 3a7a47d382 recording epics cam images 2017-11-18 16:34:07 +01:00
lemke_h b4279205c0 bs camera module 2017-11-18 02:12:49 +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 508e27eb5b motor __call__ and startup error handling 2017-11-17 08:04:50 +01:00
lemke_h 8c4685c647 bug fizes, added PIPS diode as detDio 2017-11-14 12:21:34 +01:00
lemke_h e0fe1fb9af added monXXX pbpsXXX modules, added hdf5 writer 2017-11-14 09:04:54 +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 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 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 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
Mankowsky Roman 2dce81c22f Implemented GPS and xeye 2017-11-07 12:38:03 +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
lemke_h 4afd8b2e37 minor 2017-10-29 16:13:43 +01:00