6944 Commits

Author SHA1 Message Date
a00231dab6 m3 gui: enabled trimval feature 2020-09-03 17:21:37 +02:00
Erik Frojdh
35c7e46d60 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-09-03 17:20:48 +02:00
Erik Frojdh
47da2540af json 2020-09-03 17:20:38 +02:00
891b8dbd2c mythen3: wrong hardware version number, so it didnt reboot after programfpga 2020-09-03 17:04:58 +02:00
Erik Frojdh
89f0479318 txndelay in python 2020-09-03 16:30:13 +02:00
Erik Frojdh
7048a75808 triggersl and print fix for acq 2020-09-03 16:21:15 +02:00
a081fbbdaa Merge branch 'developer' into rxrmetadata 2020-09-03 15:52:01 +02:00
Erik Frojdh
22f14cacb0 virtual and vetofile 2020-09-03 15:33:12 +02:00
Erik Frojdh
6b7dee2631 added versions and parallel to python 2020-09-03 11:49:08 +02:00
Dhanya Thattil
6d1856daa2
gui: added burstmode (#159)
Added burst mode in the GUI. Visible only for detectors that supports it.
2020-09-03 10:47:02 +02:00
7bb9696151 Merge branch 'developer' into rxrmetadata 2020-09-02 18:07:22 +02:00
Dhanya Thattil
44335f9cf4
Merge pull request #157 from slsdetectorgroup/g2printout
G2printout
2020-09-02 17:04:15 +02:00
d62d5ef804 binaries in 2020-09-02 17:03:19 +02:00
dbaab61ea2 g2: print ns in server before converting to freq 2020-09-02 17:02:12 +02:00
Dhanya Thattil
180c7b7191
Gui slot call focus fix (#150)
* fix for editingFinished for qlineedit using isModified()

* spinbox disable keyboard tracking to use valuechanged so slot called only after editing finished, focus fix

* return pressed forces qtextfield to be set (slot for tab checks for modification flag due to avoid unnecessary set when focus). This is to remove inconsistencies from command line. A return should set even if it looks like no modification in gui

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2020-09-02 16:56:57 +02:00
Dhanya Thattil
050f0ff8a0
Merge pull request #156 from slsdetectorgroup/g2clkchange
gotthard2: change default clock divider of readout clocks 1 and 2 fro…
2020-09-02 16:50:32 +02:00
658a804cca gotthard2: change default clock divider of readout clocks 1 and 2 from 8 to 6 2020-09-02 16:48:58 +02:00
Erik Frojdh
73530ddd6f python udp_srcmac 2020-09-02 16:48:51 +02:00
abe34d573c WIP 2020-09-02 16:15:33 +02:00
Erik Frojdh
05d5652532 exptime example 2020-09-02 12:32:14 +02:00
Erik Frojdh
38e0351068 zmqports work like command line 2020-09-02 12:20:08 +02:00
Erik Frojdh
e192cad1f2 zmqport fix 2020-09-02 12:07:47 +02:00
Erik Frojdh
b8350b070e rx_zmqip fix 2020-09-02 11:55:27 +02:00
Erik Frojdh
3ddeea3c2b minor fix docs 2020-09-02 11:44:13 +02:00
42b5ff3a62 WIP, doc 2020-09-02 10:25:36 +02:00
00978a52c8 added smp_clk, changed rdo vco freq from 1.25GHz to 1GHz, changed rdo clock dividers 2020-09-01 12:06:39 +02:00
8400c686b5 binaries in 2020-08-31 18:22:41 +02:00
adb6171e35 eiger server: more checks for feb interface reg readouts 2020-08-31 18:22:16 +02:00
973b8f7106 eiger server: more checks for feb interface reg readouts 2020-08-31 18:19:56 +02:00
2f81c233f5 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-08-31 14:17:14 +02:00
e4274e3f95 WIP, doc 2020-08-31 14:17:09 +02:00
Erik Frojdh
b92f9af025 hex example 2020-08-31 10:14:01 +02:00
Erik Frojdh
7ca1609c58 minor doc 2020-08-31 09:50:42 +02:00
Erik Frojdh
4cd81437ab pyver 2020-08-31 09:49:25 +02:00
Erik Frojdh
7e202b6c26 getting started 2020-08-31 09:32:48 +02:00
e0df9fcd99 wip, doc 2020-08-28 19:47:19 +02:00
30307220e3 QIP, doc 2020-08-28 18:12:08 +02:00
Erik Frojdh
6a74851e0c enums 2020-08-28 12:21:07 +02:00
Erik Frojdh
ac30717083 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-08-28 12:08:21 +02:00
Erik Frojdh
bfed02b41e getting started 2020-08-28 12:08:13 +02:00
b5669dc921 WIP, doc 2020-08-28 10:57:21 +02:00
Dhanya Thattil
97ee2d269d
Merge pull request #149 from slsdetectorgroup/stopfix
stopping in virtual server needs a usleep before acquiring lock to ge…
2020-08-27 18:22:51 +02:00
bc5cc3fa29 stopping in virtual server needs a usleep before acquiring lock to get status 2020-08-27 18:21:46 +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 Frojdh
3954913661 fixed ratecorr 0 in python 2020-08-27 16:45:14 +02:00
Erik Fröjdh
7eafceb0f9
Exposing vector of strings for loading parameters (#147) 2020-08-27 16:17:56 +02:00
a1e06ca7a9 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-08-26 17:45:17 +02:00