Erik Frojdh
|
70b2a41d5e
|
clang tidy
|
2019-04-09 10:59:09 +02:00 |
|
Erik Frojdh
|
39221f1230
|
enable lto
|
2019-04-08 14:57:10 +02:00 |
|
Erik Frojdh
|
33f726ff7e
|
shadowing variables
|
2019-04-05 17:01:29 +02:00 |
|
Erik Frojdh
|
f11db00aef
|
removed old typedef
|
2019-04-05 10:14:41 +02:00 |
|
Erik Frojdh
|
85516e42c0
|
trimEn now takes vector
|
2019-04-04 12:19:30 +02:00 |
|
Erik Frojdh
|
69a11f8950
|
cleaning up
|
2019-04-03 18:41:21 +02:00 |
|
Erik Frojdh
|
0270e18882
|
new tests
|
2019-04-03 18:11:48 +02:00 |
|
Erik Frojdh
|
90b257a74d
|
warnings
|
2019-04-03 16:17:09 +02:00 |
|
Erik Frojdh
|
3b4d36c3d4
|
bumped cmake to 3.5
|
2019-04-03 14:47:58 +02:00 |
|
|
|
c38bebd615
|
jungfrau server: added deg and maxadcphaseshift, ctb & moench server: set adc phase like jungfrau that positive shift is positive, moved conversion between shift to degrees to the common function. receiver: removed unused variables
|
2019-03-28 09:35:53 +01:00 |
|
|
|
c7c52c63cd
|
ctb & moench: phase fix for absolute within limits, option to set as degrees and get max phase shift, bug fix for eiger with implementation of 2 udp interface
|
2019-03-27 12:25:38 +01:00 |
|
|
|
7cd5bc8b2d
|
jungfrau: switching between 2 and 1 interface, implementation for server required when firmware done
|
2019-03-26 15:00:19 +01:00 |
|
|
|
cb80cf5f09
|
receiver missing packets made to have signed for getting more packets than expected
|
2019-03-20 17:34:29 +01:00 |
|
|
|
fad73a57aa
|
minor
|
2019-03-18 09:19:04 +01:00 |
|
|
|
1eff8485dd
|
receiver listener bug fix from previous commit
|
2019-03-15 10:37:47 +01:00 |
|
|
|
5fe7a86361
|
switching udpsocketbuffersize from uitn64_t to int64_t, printing socket exception into tcp error mess, changing an exception message
|
2019-03-15 10:00:22 +01:00 |
|
Erik Frojdh
|
7522a655df
|
removing warning in gcc
|
2019-03-14 17:38:40 +01:00 |
|
Erik Frojdh
|
836eb8cde2
|
explicit override
|
2019-03-14 17:15:58 +01:00 |
|
Erik Frojdh
|
9f724f0c0d
|
using only sls exceptions
|
2019-03-14 17:09:44 +01:00 |
|
Erik Frojdh
|
9639e480d9
|
new exceptions
|
2019-03-14 16:37:36 +01:00 |
|
|
|
19b21dac88
|
Listener bug fix: switching to make_unique ptr side effects, the dummy socket still alive when destructor of listener called
|
2019-03-08 16:16:40 +01:00 |
|
|
|
0553755439
|
receiver bug fix: with refactor, the callbacks were getting reset upon initialization. fixed
|
2019-03-08 09:14:29 +01:00 |
|
Dhanya Thattil
|
999a2f4d15
|
Merge pull request #8 from slsdetectorgroup/use-unique-ptr
In Listener, remove raw pointers allocations, use `unique_ptr` instead.
|
2019-03-06 17:48:28 +01:00 |
|
|
|
ca817c6ae9
|
client: update roi on updatedetector, (ctb, moench)moved nchans and databyte calculated to updatenumberofchannels and called for any update in roi, readoutflag or #samples changed (get should not update). ctb,moench server: roi fixed, . gotthard server: bug fix waiting to finish, ad9252 spi call fix. receiver: updated for moench and 10g
|
2019-03-06 17:25:18 +01:00 |
|
|
|
abc7a9bd2f
|
moench has only analog readout
|
2019-03-06 14:52:21 +01:00 |
|
|
|
2676e8b43d
|
receiver: readout flag bug fix, clent:send roi for ctb and moench
|
2019-03-06 10:55:51 +01:00 |
|
|
|
d3c1193a71
|
ctb/moench server, fixed frequency configuring bug, readpattern sleep, detectormode command, jsonheader set even if rxr offline, set speed returnvalue is value not ok/fail, rxr printout missingpackets 64 bit
|
2019-03-06 10:25:16 +01:00 |
|
Samuel Debionne
|
db232ad00d
|
in Listener, remove raw pointers allocations, use unique_ptr instead.
Add an overload of sls::make_unique for array types.
|
2019-03-06 09:07:51 +01:00 |
|
Samuel Debionne
|
04c8a2871d
|
Fix sprintf warnings
|
2019-03-05 14:34:01 +01:00 |
|
Samuel Debionne
|
c40db94474
|
Fix typos
|
2019-03-05 10:43:20 +01:00 |
|
|
|
08bd2378f4
|
slsReceiver bug fix affecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t
|
2019-03-04 09:41:20 +01:00 |
|
|
|
93192c6e84
|
bugfix receiver: setImagesize only for ctb, moench
|
2019-03-01 15:22:39 +01:00 |
|
|
|
debf3a1b01
|
ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver
|
2019-02-28 16:07:47 +01:00 |
|
|
|
7f2197fc4f
|
slsReceiver & client: 10genable allowed for moench and ctb, ctb server: better way to divide to packets to send via udp
|
2019-02-28 10:09:54 +01:00 |
|
|
|
966896b942
|
moench: get zmq goes to the receiver instead of shm, setand get threshold energey updates zmq and shm value, setand get roi anyways goes to the ddetector, so only updates zmq or gets it from rxr
|
2019-02-25 12:57:44 +01:00 |
|
Erik Frojdh
|
29d4eb8b41
|
catch by ref
|
2019-02-20 10:29:15 +01:00 |
|
|
|
6be47d936f
|
conflicts resolved
|
2019-02-14 17:32:33 +01:00 |
|
|
|
9aaca14b01
|
CMakeLists.txt: reordering and removing those we dont use anymore, removed all the Makefiles (except the ones for the detector servers)
|
2019-02-14 16:15:43 +01:00 |
|
|
|
c91c2c224a
|
Merge branch 'add-cmake-packages' of https://github.com/esrf-bliss/slsDetectorPackage into esrf-bliss-add-cmake-packages
|
2019-02-14 10:36:41 +01:00 |
|
Erik Frojdh
|
59f3f0c764
|
cleaner cmake
|
2019-02-13 15:59:42 +01:00 |
|
Erik Frojdh
|
d46d96ecca
|
fixed linking zmq
|
2019-02-13 15:35:40 +01:00 |
|
Samuel Debionne
|
c064dc84ae
|
Add generation and install of CMake packages
|
2019-02-13 10:45:01 +01:00 |
|
Samuel Debionne
|
01e3cb8d5e
|
Cherry pick commit from 4.0.1 about CMake packages
|
2019-02-13 09:44:45 +01:00 |
|
Dhanya Thattil
|
75a75b6cf6
|
Merge pull request #3 from esrf-bliss/add-slsReceiver-ctor-overload
merge for Add slsReceiver ctor overload and sls::make_unique
|
2019-02-13 09:10:33 +01:00 |
|
Samuel Debionne
|
f125b94a7d
|
Use sls::make_unique<>
|
2019-02-13 08:59:26 +01:00 |
|
Samuel Debionne
|
b18391330e
|
Add slsReceiverUsers(int tcpip_port_no) overload
Use std::unique_ptr<> instead of raw pointers
|
2019-02-12 17:01:46 +01:00 |
|
Erik Frojdh
|
2bcf88e434
|
added receiverUsers as public header
|
2019-02-12 15:26:08 +01:00 |
|
|
|
031a11c4f7
|
removed all the warnings and errors from the merge, also removed added -wextra compiler flag, (yet to add additional commands for moench)
|
2019-02-12 11:09:19 +01:00 |
|
|
|
a64b34610a
|
merge from developer (without the additional json header implementations)
|
2019-02-12 09:35:24 +01:00 |
|
Erik Frojdh
|
c3472f295b
|
split client and server interface
|
2019-01-23 12:07:44 +01:00 |
|
