2795 Commits

Author SHA1 Message Date
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
Dhanya Thattil
b0dd82c667
removing sem_wait in acquire (#182) 2020-09-17 13:55:20 +02:00
Erik Frojdh
2d2e80469c format 2020-09-17 12:18:34 +02:00
Erik Frojdh
5d648443fa replaced remaning {} 2020-09-17 12:18:08 +02:00
Erik Frojdh
1fb7352378 added missing unit in test 2020-09-17 12:13:09 +02:00
Erik Frojdh
511c206787 replaced initializer list with vector for CmdProxy 2020-09-17 12:11:19 +02:00
Erik Frojdh
74edb6a1c1 test for single mod exptime 2020-09-17 11:42:44 +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
a4926e6ae1 help fix for cmd line 2020-09-10 17:04:08 +02:00
be8284f5c2 nmod added to command line 2020-09-10 16:57:30 +02:00
Erik Frojdh
d420451751 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-09-10 14:45:38 +02:00
Erik Frojdh
2bc33ad34a default value for setDAC 2020-09-10 14:45:31 +02:00
a0f915316e rx_readfreq to rx_zmqfreq and rx_datastream to rx_zmqstream 2020-09-10 14:11:21 +02:00
11e7d89da3 Merge branch 'developer' into pydoc 2020-09-10 12:01:38 +02:00
Erik Frojdh
34043c358f Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-09-10 11:53:31 +02:00
Erik Frojdh
da9c7c354e adc- 2020-09-10 11:53:17 +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
503f83e8e3 Merge branch 'developer' into g2continuous 2020-09-07 17:07:09 +02:00
a77833b4c7 Merge branch 'developer' into g2continuous 2020-09-07 16:36:00 +02:00
cf3758f155 Merge branch 'developer' into rxrmetadata 2020-09-07 16:15:56 +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
Dhanya Thattil
1edb1e8816
GUI: adding 1D detectors by default in x direction, others in y dir (#164) 2020-09-07 13:03:15 +02:00
30e06c6386 Merge branch 'developer' into rxrmetadata 2020-09-07 11:53:41 +02:00
Erik Frojdh
fb8842e048 build and libname 2020-09-07 09:14:47 +02:00
5b182469a1 rxr: fixed all updates from rxParameters, connected them in masterAttributes, added json header and scan parametes in metadata 2020-09-04 13:49:30 +02:00
Erik Frojdh
514346c3ba static support lib 2020-09-04 11:00:34 +02:00
abe34d573c WIP 2020-09-02 16:15:33 +02:00
42b5ff3a62 WIP, doc 2020-09-02 10:25:36 +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 Frojdh
2e4783f296 sort and remove duplicates before sending rxdbitlist 2020-08-27 17:08:53 +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