Commit Graph
43 Commits
Author SHA1 Message Date
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) 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
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 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 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
Roman Mankowsky e646411c54 Added waveplate as lasExp.wp 2017-11-28 11:28:06 +01:00
Svetina Cristian b95815b90b Added Reference laser module and to Bernina aliases. 2017-11-25 14:25:17 +01:00
Roman Mankowsky 2c904e8d9a slit att and fized screenshot 2017-11-24 22:50:17 +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 f25d4f7506 Front end attenuator 2017-11-18 16:37:24 +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 c912fe335c screenshot, fixes 2017-11-17 21:32:31 +01:00
lemke_h 3039e0347d fixed and extended 2017-11-15 20:48:36 +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
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 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 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 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 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