5165 Commits

Author SHA1 Message Date
0735f890a3 Modified waveform plots for 10Gb (to be tested) 2019-08-21 17:19:54 +02:00
1b5e939748 Added 10Gb data structures for moench04 (to be tested) 2019-08-21 16:57:54 +02:00
2ef9aa0ea0 fixed conflict 2019-08-21 16:28:45 +02:00
cadb4cff93 moench02 common mode moved to new structure 2019-08-21 16:27:14 +02:00
e04242c5fa ctb gui progress call back fix 2019-08-21 15:40:19 +02:00
434aa78a04 Merge branch 'developer' into apidhanya 2019-08-21 15:36:08 +02:00
cf045d8a1d ctb gui fix 2019-08-21 15:18:50 +02:00
a98271f0c2 merge resolved 2019-08-21 14:25:21 +02:00
5c393e6204 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-08-21 13:23:38 +02:00
5eaea5fb8d updated ctb server 2019-08-21 13:22:43 +02:00
f0ba8a06ce ctb 10g fix for old reciever 2019-08-21 13:21:35 +02:00
4b0fb5029f WIP 2019-08-21 12:45:08 +02:00
Erik Fröjdh
b4c207fc4e Less data race in slsReceiver (#50)
* removed some data races

* non needed mutex

* removed extra include
2019-08-21 12:02:06 +02:00
f77b6ab068 WIP 2019-08-21 11:32:45 +02:00
0daada9266 version 2019-08-21 11:15:10 +02:00
422a928be4 ctb rxr: changing to old header (like moench) 2019-08-21 11:13:17 +02:00
156ce0df00 ctb fix:fifo print between frames, pattern length change 2019-08-21 11:09:41 +02:00
62c4bfab64 WIP 2019-08-21 09:23:32 +02:00
28963e313b removed gotthard functions not used 2019-08-20 18:18:34 +02:00
11c1fb0e11 Added roi to master file 2019-08-20 13:42:26 +02:00
9ebff9c8a8 updated gui to have the timer/freq 2019-08-20 13:30:22 +02:00
ad907a43be Merge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-20 13:20:35 +02:00
ea5ac6ad03 WIP 2019-08-20 13:20:25 +02:00
Erik Frojdh
d1ea74120d added string concat to ToString 2019-08-20 12:17:42 +02:00
0c4ae89cd9 WIP 2019-08-20 11:20:12 +02:00
38b7e23ac4 WIP 2019-08-20 10:55:55 +02:00
08ac9b4ce8 other detectors made to cmake 2019-08-20 09:12:32 +02:00
51a3f3fd4d changed logger.h to clogger.h for c files 2019-08-20 08:48:12 +02:00
29c788b9f7 WIP 2019-08-19 21:28:53 +02:00
0f37481972 WIP 2019-08-19 21:17:52 +02:00
0d787788ea WIP ctb 2019-08-19 21:14:45 +02:00
498a8bda9f WIP 2019-08-19 21:09:44 +02:00
Erik Fröjdh
3e874a3650 removed symlinks in jf server (#49) 2019-08-19 20:40:50 +02:00
3881e2cd21 WIP 2019-08-19 20:36:42 +02:00
ee4aa94bbe WIP 2019-08-19 18:03:19 +02:00
d2e8c3bebc WIP 2019-08-19 16:33:53 +02:00
0d2598bd77 WIP 2019-08-19 16:00:23 +02:00
eebd1552f2 WIP 2019-08-19 15:55:42 +02:00
26958e99ef WIP 2019-08-19 10:48:05 +02:00
7457c56533 slsmultireceiver copied to slsreceiver/src cmake 2019-08-19 09:08:10 +02:00
d10d9462a3 virtual servers using command virtual numdet port 2019-08-16 19:31:26 +02:00
c6dddaba97 allowed virtual servers 2019-08-16 18:49:08 +02:00
a0bdfcdae3 WIP 2019-08-16 17:38:41 +02:00
d3e60eba80 eiger binary 2019-08-16 17:08:11 +02:00
10ce82fc5f WIP 2019-08-16 17:07:30 +02:00
b59d69325e updated minor 10g ctb 2019-08-16 15:35:23 +02:00
Erik Frojdh
336f8ceb50 WIP 2019-08-16 10:46:42 +02:00
947252c852 WIP 2019-08-16 09:45:49 +02:00
e635ff035c receiver master file includes quad, gap pixels enable, version updated for binary and hdf5, parallel, analog, digital, adc, dbitofset, dbitlist 2019-08-14 21:14:06 +02:00
8dae9243a5 t puMerge branch 'apidhanya' of github.com:slsdetectorgroup/slsDetectorPackage into apidhanya 2019-08-14 17:49:38 +02:00