44 Commits

Author SHA1 Message Date
Dhanya Thattil
894cc1c9e0
Simulator (#28)
* WIP

* wip

* wip

* removed loop

* sending 1 frame

* send multiple frames

* c11 for server

* WIP

* WIP

* Add CMake for the simulators. Requires some refactoring to make slsDetectorServer a proper library.

* Working cmake for jungfrau

* Working cmake for eiger

* WIP

* WIP

* Add preliminary working eiger simulator and breaks the jungfrau simulator

* virtual servers connected

* changes to make it work for rhel7 and install binaries in bin

* removed some unnecessary prints

* removed binaries and virtual makefiles
2019-06-03 10:16:54 +02:00
Erik Frojdh
452fd1e457 new defaults for CMake 2019-05-22 09:45:08 +02:00
20720bc073 Merge branch 'developer' into rxctb 2019-05-03 20:38:32 +02:00
e14519c236 slsReceiver: removed special receiver config, added rx_dbitlist, rx_dbitoffset to put bits together in file, connected adcinvert, extsamplingsrc and extsampling properly to the detector, added tests 2019-05-03 20:37:40 +02:00
Erik Fröjdh
1094d5d30c Build doxygen documentation by cmake (#17)
* added cmake command to make doxygen docs

* added back doxyfile for users
2019-05-03 14:58:15 +02:00
Erik Frojdh
8cc8b58b05 sendToDetector 2019-04-24 15:24:56 +02:00
9e16dcb1e6 reverting cmake policy change 2019-04-24 13:46:19 +02:00
262140728f receiver callback rearranging data for mythen302 2019-04-24 13:30:57 +02:00
Erik Frojdh
77c1ffffb1 fix 2019-04-12 11:32:46 +02:00
Erik Frojdh
c16b19ed1f supress waring on gcc<6 2019-04-12 11:31:03 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02: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
Erik Frojdh
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
Erik Frojdh
0ef030354f warning 2019-02-08 14:03:49 +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
Erik Frojdh
cd738106ec printf and uninitialized variables 2019-02-08 11:14:16 +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
Erik Frojdh
d74a8368b8 commented find pkg png 2018-08-10 14:11:16 +02:00
40c96b5562 Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings 2018-07-18 12:29:19 +02:00
45de361b22 slsReceiver: added an executable slsMultiReceiver to have the option to have one process create multiple child processes for multiple receivers with configurable tcp port and callback enable 2018-07-06 16:26:29 +02:00
16428f3828 esrf changes: CMake: support to be added and installed as a sub-project:
* Configure zmq as global imported library in slsReceiverSoftware
* Install zmq, necessary if linking to slsReceiver library
2018-04-25 18:24:08 +02:00
cac913831c esrf change: CMake: add support for GCC versions older than 6.1 2018-04-23 12:07:13 +02:00
Erik Frojdh
da010a03d7 added -std=c++98 to CXX flags 2018-04-04 18:07:33 +02:00
64c18469bd release changes, gui compile via anaconda changes 2018-02-27 10:29:56 +01:00
Erik Frojdh
3edac42ed3 remove png 2018-01-25 15:16:56 +01:00
Erik Frojdh
17d26869b5 specific libpng version 2018-01-25 14:32:04 +01:00
Erik Frojdh
933d34590b find png 2018-01-25 13:47:19 +01:00
Dhanya Maliakal
d6a4f83a99 ignore misleading indentation 2017-12-11 11:13:25 +01:00
Dhanya Maliakal
29d66e455d possible to make only certain components of system 2017-12-11 10:51:19 +01:00
Dhanya Maliakal
65b4c69847 REST implementation removed from slsReceiver 2017-12-05 11:03:52 +01:00
Dhanya Maliakal
b020270734 edited cmake to show warnings 2017-11-17 08:46:59 +01:00
Dhanya Maliakal
dedc00f1bd compiling with rflag 2017-11-13 12:28:27 +01:00
Xiaoqiang Wang
634fbc748e compile libraries with -fPIC flag 2017-08-23 16:13:36 +02:00
Dhanya Maliakal
8f1e8b1196 cmake withotu hdf5 2017-08-04 15:40:44 +02:00
Dhanya Maliakal
efd49ae92a removing individual hdf5 path from cmakelists 2017-07-27 13:55:23 +02:00
Xiaoqiang Wang
6cb387e3a8 tab->space reformat 2017-07-27 12:45:27 +02:00
Xiaoqiang Wang
05b32ce26c find hdf5 cxx component 2017-07-27 12:44:21 +02:00
Dhanya Maliakal
1d073b6897 sort of works, but needs simpler fix 2017-07-27 12:07:44 +02:00
Dhanya Maliakal
e360077e09 changes for the cmake 2017-07-27 10:17:55 +02:00
36904db3ca now GUI is compatible with qwt 6.1 2016-09-02 16:28:01 +02:00
61d347b45d FindQwt returns qwt verison
This can be used to check compatibility
2016-09-01 14:42:47 +02:00
0807e130e4 optionally build calibrationWizards 2016-09-01 11:14:29 +02:00
316ed783a8 add cmake configuration 2016-08-31 20:49:58 +02:00