4769 Commits

Author SHA1 Message Date
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
Samuel Debionne
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
Gemma Tinti
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
Erik Frojdh
23dce681b2 added clang format and clang tidy from refactor 2019-02-04 14:11:06 +01:00
Gemma Tinti
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
b8fec6c050 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 2019-02-01 18:48:25 +01:00
2f11681d3f gotthard server: configmac should also set cycles for sending dummy frame 2019-01-30 18:24:25 +01:00
12f8166d25 manual acq changed config file, added some changes for jungfrau that aren;t tested, but soleil acq test passed 2019-01-29 15:49:41 +01:00
Erik Frojdh
536c853d79 hack for receiver port 2019-01-25 19:41:33 +01:00
Erik Frojdh
f1d055138c moved updateDetector/Receiver 2019-01-25 19:12:28 +01:00
Erik Frojdh
82ce6b639c more cout 2019-01-25 16:53:19 +01:00
Erik Frojdh
7d9417dffe fixed debug couts 2019-01-25 16:48:04 +01:00
Erik Frojdh
89ee1d5bcf new socket for slsDetector 2019-01-25 16:44:29 +01:00
Erik Frojdh
a1c0d28ddb changed constructor 2019-01-24 11:12:24 +01:00
Erik Frojdh
c3472f295b split client and server interface 2019-01-23 12:07:44 +01:00
Erik Frojdh
99a1c609f1 starting to add new Socket interface 2019-01-23 11:47:13 +01:00
Erik Frojdh
3eca4c0535 typo 2019-01-21 14:44:06 +01:00
Erik Frojdh
b200138730 data types and format 2019-01-21 14:43:24 +01:00
Erik Frojdh
a4fec1e750 format and no check before delete 2019-01-21 12:10:00 +01:00
Erik Frojdh
46036e5dde braces around statements 2019-01-21 11:41:19 +01:00
Erik Frojdh
d2ed245d1d format and removed nullptr check before delete 2019-01-21 11:18:27 +01:00
Erik Frojdh
b74aed91dc consistent naming between header and source file 2019-01-21 11:11:39 +01:00
Erik Frojdh
e1ec60c9c1 cleaning up tests for command line parser 2019-01-21 10:45:43 +01:00
Erik Frojdh
603b217b54 clang-tidy modernize 2019-01-18 15:15:39 +01:00
Erik Frojdh
449e4da892 removed potential memory leak in readSettingsFile 2019-01-18 15:13:17 +01:00
Erik Frojdh
1ec9d950d5 malloc to new 2019-01-18 15:00:52 +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
Erik Frojdh
13d6d3f866 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2019-01-17 17:30:46 +01:00
Erik Frojdh
eff17371a5 removed virtual 2019-01-17 17:30:36 +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
b07492be6f removing multiSlsDetectorCommand and using namespace std 2019-01-17 14:45:51 +01:00
Erik Frojdh
c05829031f removed get from the users class and changed put 2019-01-17 14:20:03 +01:00
fd68a41918 udp socket creation error, udpsocket assigned only after. unique ptr later 2019-01-16 19:46:08 +01:00
Erik Frojdh
76da6a07aa using new CmdLineParser 2019-01-16 18:46:34 +01:00
Erik Frojdh
db0807bf7b adding cmdline parser 2019-01-16 16:50:19 +01:00
Erik Frojdh
b19b2a044c minor 2019-01-16 15:22:18 +01:00
Erik Frojdh
1ebe0f5624 spelling 2019-01-16 15:18:49 +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