|
|
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 |
|
|
|
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 |
|
|
|
59f3f0c764
|
cleaner cmake
|
2019-02-13 15:59:42 +01:00 |
|
|
|
d46d96ecca
|
fixed linking zmq
|
2019-02-13 15:35:40 +01:00 |
|
|
|
c064dc84ae
|
Add generation and install of CMake packages
|
2019-02-13 10:45:01 +01:00 |
|
|
|
01e3cb8d5e
|
Cherry pick commit from 4.0.1 about CMake packages
|
2019-02-13 09:44:45 +01:00 |
|
|
|
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 |
|
|
|
f125b94a7d
|
Use sls::make_unique<>
|
2019-02-13 08:59:26 +01:00 |
|
|
|
b18391330e
|
Add slsReceiverUsers(int tcpip_port_no) overload
Use std::unique_ptr<> instead of raw pointers
|
2019-02-12 17:01:46 +01:00 |
|
|
|
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 |
|
|
|
c3472f295b
|
split client and server interface
|
2019-01-23 12:07:44 +01:00 |
|
|
|
1b28cc88ff
|
step one project reorganization
|
2019-01-18 14:41:04 +01:00 |
|
|
|
8d6ee6ff46
|
moved shm deleted .project
|
2019-01-18 11:40:10 +01:00 |
|
|
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +01:00 |
|
|
|
13f9b9929a
|
slsreceiver: removed option to start receiver with config file, redundant as the only option is receiver tcp port
|
2019-01-17 15:17:08 +01:00 |
|
|
|
49f71ffca7
|
project wide nullptr fix
|
2019-01-16 15:15:29 +01:00 |
|
|
|
80a1a3d796
|
moved ClientInterface to src
|
2019-01-16 15:10:24 +01:00 |
|
|
|
1ce8f3d092
|
udpSocket might still exist when error in creation, will conver to unique ptr later
|
2019-01-16 13:37:00 +01:00 |
|
|
|
901785b818
|
only destroy sem if it was initialized
|
2019-01-16 11:51:50 +01:00 |
|
|
|
7303734b19
|
removing static libs and changing flags
|
2019-01-15 16:56:33 +01:00 |
|
|
|
5ae31bc438
|
receiver bug fix: dataprocess gappixels enable check to create tempbuffer always true
|
2019-01-11 15:21:16 +01:00 |
|
|
|
0841df98d4
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-01-11 11:27:52 +01:00 |
|
|
|
1bd0b33806
|
functions not overriding base and unitialized use
|
2019-01-11 11:27:48 +01:00 |
|
|
|
de2ebad2ed
|
receiver: removed unused silentmode from DataStreamer
|
2019-01-11 11:19:16 +01:00 |
|
|
|
c6a597c3ec
|
minor changes and removed W flag not found
|
2019-01-11 11:07:50 +01:00 |
|
|
|
f161d68efc
|
fix in ltc, added moench, separated servers, left to do max1932, client side for moench and more detailed in ctb server side
|
2018-12-19 16:38:18 +01:00 |
|
|
|
8f3f9caf2b
|
almost done with ctb update, need to do slow adcs, split to moench and ctb
|
2018-11-30 10:39:26 +01:00 |
|
|
|
8942098a90
|
gotthard works, data to be authenticated when personnel available
|
2018-11-09 15:25:26 +01:00 |
|
|
|
833f0c164c
|
reciever hdf5 compiling error fixed
|
2018-11-02 14:31:36 +01:00 |
|
|
|
b43be57b6e
|
jungfrau server works
|
2018-11-02 13:50:00 +01:00 |
|
|
|
70a1b87603
|
merge conflict resolved
|
2018-10-30 14:31:20 +01:00 |
|
|
|
dfa8cf7381
|
runs, prints right in reciever
|
2018-10-30 13:35:20 +01:00 |
|
|
|
92fc837eb4
|
compiles, but doesnt run
|
2018-10-29 15:23:52 +01:00 |
|
|
|
33ac63d14a
|
still updating slsdetector.cpp
|
2018-10-26 17:40:18 +02:00 |
|
|
|
cf87b6ca83
|
still updating slsdetector.cpp
|
2018-10-25 16:24:05 +02:00 |
|
|
|
261849d69c
|
eiger server compiles, client side of interface to do
|
2018-10-23 16:20:40 +02:00 |
|
|
|
86fb843021
|
in the process of rewriting detector client interface
|
2018-10-18 10:58:48 +02:00 |
|
|
|
5c2ff84c0e
|
removed unused variable numberofJobs in receiver implementation
|
2018-10-17 11:39:27 +02:00 |
|
|
|
42c4e3e1a1
|
cleanup
|
2018-10-16 17:47:48 +02:00 |
|
|
|
014dfaa251
|
moved to vector of unique pointer in slsReceiverImplementation
|
2018-10-16 17:30:43 +02:00 |
|
|
|
b50d359ee6
|
better name
|
2018-10-16 15:53:01 +02:00 |
|
|
|
b5a2c91873
|
removed printf with same source and dest
|
2018-10-16 15:50:51 +02:00 |
|
