|
|
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 |
|
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 |
|
Erik Frojdh
|
1b28cc88ff
|
step one project reorganization
|
2019-01-18 14:41:04 +01:00 |
|
Erik Frojdh
|
8d6ee6ff46
|
moved shm deleted .project
|
2019-01-18 11:40:10 +01:00 |
|
Erik Frojdh
|
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 |
|
Erik Frojdh
|
49f71ffca7
|
project wide nullptr fix
|
2019-01-16 15:15:29 +01:00 |
|
Erik Frojdh
|
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 |
|
Erik Frojdh
|
901785b818
|
only destroy sem if it was initialized
|
2019-01-16 11:51:50 +01:00 |
|
Erik Frojdh
|
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 |
|
Erik Frojdh
|
0841df98d4
|
Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor
|
2019-01-11 11:27:52 +01:00 |
|
Erik Frojdh
|
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 |
|
Erik Frojdh
|
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 |
|
Erik Frojdh
|
5c2ff84c0e
|
removed unused variable numberofJobs in receiver implementation
|
2018-10-17 11:39:27 +02:00 |
|
Erik Frojdh
|
42c4e3e1a1
|
cleanup
|
2018-10-16 17:47:48 +02:00 |
|
Erik Frojdh
|
014dfaa251
|
moved to vector of unique pointer in slsReceiverImplementation
|
2018-10-16 17:30:43 +02:00 |
|
Erik Frojdh
|
b50d359ee6
|
better name
|
2018-10-16 15:53:01 +02:00 |
|
Erik Frojdh
|
b5a2c91873
|
removed printf with same source and dest
|
2018-10-16 15:50:51 +02:00 |
|
Erik Frojdh
|
3c9b1884d3
|
removed conditional operator and moved to range for
|
2018-10-16 15:25:15 +02:00 |
|
Erik Frojdh
|
66e79dc9a9
|
refactoring startReadout
|
2018-10-16 15:08:59 +02:00 |
|
Erik Frojdh
|
5b8dfd7943
|
range based for loops for reset acq count
|
2018-10-16 14:34:34 +02:00 |
|
|
|
8382d0f5f9
|
receiver tcp interface updated
|
2018-10-12 17:03:19 +02:00 |
|
|
|
c24a9b223c
|
combined all the funcs into one, servers need to be recompiled
|
2018-10-11 13:57:47 +02:00 |
|
|
|
b82fca2c8e
|
removed warnings
|
2018-10-11 13:32:24 +02:00 |
|
|
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +02:00 |
|
|
|
f69e9d0df4
|
refactored client interface (client ot receiveR)
|
2018-10-10 18:09:14 +02:00 |
|
