|
|
f9be8b89ac
|
added functionality to set additional json header key value pairs for prototype ctb, server fixed for eiger compile from ctb integration
|
2019-02-13 09:37:31 +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 |
|
|
|
ed74e710d6
|
merge from 4.0.1
|
2019-02-11 14:37:54 +01:00 |
|
|
|
907d1655d1
|
merge from 4.0.1
|
2019-02-11 14:04:09 +01:00 |
|
|
|
a7ba5eb0d8
|
updated release.txt
|
2019-02-08 17:46:13 +01:00 |
|
|
|
6bf1a944da
|
updaterev
|
2019-02-08 17:28:44 +01:00 |
|
|
|
3c77447868
|
removed minor warnings
|
2019-02-08 16:32:23 +01:00 |
|
|
|
046fb11e5e
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-08 16:02:15 +01:00 |
|
|
|
b89d56001e
|
CMake: prefixing the options with SLS_
|
2019-02-08 16:02:05 +01:00 |
|
|
|
de204dee38
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-08 14:03:56 +01:00 |
|
|
|
0ef030354f
|
warning
|
2019-02-08 14:03:49 +01:00 |
|
|
|
dccce9bf55
|
Merge branch 'esrf-bliss-add-targets-export-name' into 4.0.1-rc
|
2019-02-08 13:09:06 +01:00 |
|
|
|
441c3dc5db
|
Merge branch 'add-targets-export-name' of https://github.com/esrf-bliss/slsDetectorPackage into esrf-bliss-add-targets-export-name
Pull request from Samuel ESRF
|
2019-02-08 13:07:08 +01:00 |
|
|
|
afd9e29424
|
updated release.txt to have eriks bug fix for receiver gap pixels enable in reciever
|
2019-02-08 12:53:58 +01:00 |
|
|
|
ce939b3cd6
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-08 12:45:45 +01:00 |
|
|
|
0984654fd0
|
updated release.txt
|
2019-02-08 12:33:04 +01:00 |
|
|
|
cd738106ec
|
printf and uninitialized variables
|
2019-02-08 11:14:16 +01:00 |
|
|
|
0e120330f4
|
fixed comparisons to build with clang
|
2019-02-08 10:16:32 +01:00 |
|
|
|
985b2eba4d
|
ctb registers updated
|
2019-02-07 18:05:15 +01:00 |
|
|
|
bf0e0ac601
|
updated binaries in serverbin
|
2019-02-07 17:06:07 +01:00 |
|
|
|
143682cfb1
|
updaterev
|
2019-02-07 16:55:01 +01:00 |
|
|
|
a5ee9fbdba
|
ctb bug fixes: pattern generator, vchip, dacs
|
2019-02-07 16:51:18 +01:00 |
|
|
|
166541bd15
|
ctb adc phase get fix
|
2019-02-06 19:05:11 +01:00 |
|
|
|
140996fae6
|
ctb adc fix, update detector fix, acq error fix
|
2019-02-06 18:50:50 +01:00 |
|
|
|
3f43767d38
|
ctb client updated
|
2019-02-06 17:45:19 +01:00 |
|
|
|
a76cc90972
|
adc command line bug, ctb api added to client
|
2019-02-06 17:25:36 +01:00 |
|
|
|
0c1a3b7756
|
eiger bug fix: multi hv and eiger should not return -1 if different, ctb : dacs are 24 not 16
|
2019-02-06 17:07:13 +01:00 |
|
|
|
18ab437ae5
|
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
olddeveloper
|
2019-02-06 16:30:59 +01:00 |
|
|
|
3b56091e2f
|
new header for raw files
|
2019-02-06 16:30:37 +01:00 |
|
|
|
dcad6c80ce
|
minor modifications for interpolation and mythe data structure
|
2019-02-06 16:22:17 +01:00 |
|
|
|
076faa62e0
|
ctb server: server starts up good. Need to debug each function in detail
|
2019-02-06 15:50:44 +01:00 |
|
|
|
22686e1e25
|
eiger server bug fix: getmeasured period and exptime gets 32 bit from Febinterface and needs to be casted to int64_t before multiplying by 10
|
2019-02-06 14:52:52 +01:00 |
|
|
|
bb37915419
|
stdexcept added to compile
|
2019-02-05 14:44:49 +01:00 |
|
|
|
e13ecc8625
|
Add slsReceiver and slsDetector targets to the export set (used by donwstream project)
set TARGETS_EXPORT_NAME if the project is built directly.
|
2019-02-05 11:51:03 +01:00 |
|
|
|
ef3e01b9bd
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-05 10:49:46 +01:00 |
|
|
|
dffa4d9de5
|
eiger manual
|
2019-02-05 10:46:37 +01:00 |
|
|
|
dfca81208b
|
manual acq: uncomment insignificant
|
2019-02-05 10:36:33 +01:00 |
|
|
|
37be7d0e2b
|
manual acq config added
|
2019-02-04 17:54:58 +01:00 |
|
|
|
49812a34ae
|
manual acq changes for debugging
|
2019-02-04 17:31:58 +01:00 |
|
|
|
133b82ad61
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-04 16:43:44 +01:00 |
|
|
|
61e769773b
|
got rid of insignificant printouts from debugging
|
2019-02-04 16:43:37 +01:00 |
|
|
|
23dce681b2
|
added clang format and clang tidy from refactor
|
2019-02-04 14:11:06 +01:00 |
|
|
|
6abfdcb2c8
|
manual
|
2019-02-04 10:48:42 +01:00 |
|
|
|
7481c7f0e6
|
Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc
|
2019-02-01 18:50:08 +01:00 |
|
|
|
3c2bbf6ad4
|
gotthard server: possible fix for master and slave sync problem when configuring mac for different frames and sending dummy image, still problem of missing or extra 2 packets inslave or master not sending any frames sometimes, multi: possible fix of image reconstruction in x direction in gui
|
2019-02-01 18:48:51 +01:00 |
|
