226 Commits

Author SHA1 Message Date
Dhanya Thattil
2c1fddee84
Cmddacs (#189)
Moved dacs to it's own command for command line. 
Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2020-09-24 17:16:34 +02:00
Erik Frojdh
0b0f5c94d5 master file no index 2020-09-23 16:28:50 +02:00
d06e0d1e7f wip, doc 2020-09-23 15:07:12 +02:00
750adffe6a wip, doc 2020-09-23 15:07:03 +02:00
b23410bc5e wip, doc 2020-09-23 14:58:25 +02:00
e786b9f037 wip, doc 2020-09-23 13:15:53 +02:00
bd4299fd15 Wip, doc 2020-09-23 12:32:51 +02:00
a4bdffd0b9 Merge branch 'eigerserverlock' into developer 2020-09-22 18:48:35 +02:00
bb575c6017 wip, doc 2020-09-22 18:39:46 +02:00
65da9e701b wip, doc 2020-09-21 18:30:33 +02:00
804ad0997c wip, doc 2020-09-21 18:20:59 +02:00
4ad486fda0 Merge branch 'developer' into eigerserverlock 2020-09-21 17:28:38 +02:00
a8cc47d25c wip, doc 2020-09-21 17:27:49 +02:00
54ca9f7ebb wip, doc 2020-09-21 17:09:39 +02:00
569c014d3c WIP, doc 2020-09-21 11:23:46 +02:00
0906efaf31 moving temp_fpgafl and temp_fpgafr back to the stop server 2020-09-18 14:09:23 +02:00
Erik Frojdh
6d01348bf4 removed setClockFrequency and added some python commands 2020-09-17 16:03:58 +02:00
3376f7fa37 wip, doc 2020-09-14 15:39:21 +02:00
f061d2273a wip, doc 2020-09-14 15:18:48 +02:00
01921bc016 WIp, doc 2020-09-11 16:05:53 +02:00
f644cba244 wip, doc 2020-09-11 15:19:22 +02:00
ad95f729dc subheadings in Detector API doc 2020-09-11 12:15:51 +02:00
3b071cc43f WIP doc 2020-09-11 09:30:30 +02:00
Erik Frojdh
2bc33ad34a default value for setDAC 2020-09-10 14:45:31 +02:00
11e7d89da3 Merge branch 'developer' into pydoc 2020-09-10 12:01:38 +02:00
Dhanya Thattil
4d499e231d
Merge pull request #178 from slsdetectorgroup/eigertempblockingfix
eiger temp fix: tempfpgafl and tempfpgafr cannot be used during block…
2020-09-10 11:48:31 +02:00
0a7809286b eiger temp fix: tempfpgafl and tempfpgafr cannot be used during blocking acquire as it goes through control server now 2020-09-10 11:47:42 +02:00
Dhanya Thattil
3cd4f3897b
M3: software trigger (#175) 2020-09-10 10:15:45 +02:00
02d4769f6a WIP 2020-09-09 16:39:48 +02:00
67f1f9924a m3:software trigger 2020-09-08 15:45:35 +02:00
8e49a114db moench: removed api that goes only to processor (future: one has to use rX_jsonaddheader or rx_jsonpara to set key and values) 2020-09-08 12:34:56 +02:00
311cebcd00 m3:added parallel mode 2020-09-08 12:16:02 +02:00
b20720686e gotthard2: changed order of burst mode enums, added a 4th burst mode cw internal burst mode 2020-09-07 16:13:33 +02:00
e4274e3f95 WIP, doc 2020-08-31 14:17:09 +02:00
e0df9fcd99 wip, doc 2020-08-28 19:47:19 +02:00
30307220e3 QIP, doc 2020-08-28 18:12:08 +02:00
b5669dc921 WIP, doc 2020-08-28 10:57:21 +02:00
abd2808924 WIP, doc 2020-08-27 18:00:19 +02:00
786b14e88b Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-08-27 17:58:21 +02:00
f19799343e WIP, doc 2020-08-27 17:58:15 +02:00
Erik Fröjdh
7eafceb0f9
Exposing vector of strings for loading parameters (#147) 2020-08-27 16:17:56 +02:00
27c1916d63 WIP, doc 2020-08-26 17:45:12 +02:00
6d8168722a WIP, doc 2020-08-26 11:11:51 +02:00
bc09b8bfb9 WIP doc 2020-08-21 17:13:43 +02:00
e85326d415 WIP doc 2020-08-21 16:00:33 +02:00
396685e6a9 WIP doc 2020-08-21 15:25:47 +02:00
cf6a48d7a9 WIP doc 2020-08-21 13:20:32 +02:00
4f45110cda WIP doc 2020-08-21 13:05:33 +02:00
550ab51f34 wip doc 2020-08-20 16:59:38 +02:00
ffd694eda1 temlist and tempvalues added 2020-08-20 15:16:28 +02:00