545 Commits

Author SHA1 Message Date
4213a161fe WIP 2019-06-14 16:38:42 +02:00
5d2567005d WIP 2019-06-12 14:40:04 +02:00
e6361c73fc WIP 2019-06-12 11:24:05 +02:00
afb6d6bf3a WIP 2019-06-12 10:40:56 +02:00
b922b79232 WIP 2019-06-11 16:36:02 +02:00
d3467432a9 WIP 2019-06-11 15:43:24 +02:00
cb2c39c62f WIP 2019-06-11 15:38:04 +02:00
111c48e3fa WIP 2019-06-11 11:29:45 +02:00
d2d25cdd69 WIP 2019-06-11 11:19:07 +02:00
1bab010d0b WIP 2019-06-11 10:15:40 +02:00
f0872174cf WIP 2019-06-07 18:53:57 +02:00
ca5a0b4cc8 WIP Settings 2019-06-07 10:58:47 +02:00
48dd0fb084 WIP 2019-06-06 18:41:31 +02:00
bb760f3210 WIP datatoutput 2019-06-06 15:04:05 +02:00
e4546c6121 WIP 2019-06-05 17:54:56 +02:00
862dc824ba WIP 2019-06-05 11:27:19 +02:00
d076be8887 WIP 2019-06-04 10:27:23 +02:00
c30485a65b advanced down 2019-05-08 16:44:08 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
ed74e710d6 merge from 4.0.1 2019-02-11 14:37:54 +01:00
6bf1a944da updaterev 2019-02-08 17:28:44 +01:00
143682cfb1 updaterev 2019-02-07 16:55:01 +01:00
f810a9e9fb updated rev 2019-01-04 09:13:00 +01:00
e631414526 updated version 2018-09-27 18:23:08 +02:00
970d448e73 receiver: using namespace std removed from all the headers and the bug fixes for that for hdf5 2018-09-26 10:53:45 +02:00
80c0d4e10e gui: bug fix advanced tab (network and trimming) was a mess 2018-09-25 18:00:21 +02:00
235002cdd4 gui: fixed title height 2018-09-20 14:48:36 +02:00
588037fd18 updated release version 2018-08-23 16:23:24 +02:00
4e446f1f39 eiger server: changed subperiod to subdeadtime, changing subexptime or subdeadtime sets subperiod in eiger server 2018-08-17 13:45:09 +02:00
da4253fe13 Exception handling from constructors for slsDetector and multiSlsDetector, zmqsockets deleted first in multi freeshm/constructor, removed unnecessary exceptions from exceptions list, replaced in slsDetector socket assign from NULL to 0 2018-08-10 17:07:29 +02:00
1102153d2b Exceptions handling in constructor for genericSocket, created object to handle both socket descriptors upon throwing exception in constructor (as raw pointers wont get destructed automatically) 2018-08-09 15:43:56 +02:00
52b1e98726 merge 2018-08-08 12:06:14 +02:00
44fdc46c11 some changes in the moench executables 2018-08-08 10:23:35 +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
a970bacbe5 slsDetectorGui: JCTB does not kill itself for wrong settings anymore 2018-05-28 11:29:35 +02:00
Erik Frojdh
f45e2b4ab9 changed type of getCalDir to std::string 2018-05-25 10:30:02 +02:00
Erik Frojdh
abdf4b1ada converting to Qstring 2018-05-25 10:19:09 +02:00
Erik Frojdh
a1831c38ed replace lostFocus with editingFinished for QT 2018-05-18 17:05:35 +02:00
563b1bb8b7 slsDetectorGui:added subexptime and subperiod to gui 2018-05-17 15:34:35 +02:00
b4d9a6a09d slsReceiver, slsDetector(eiger server), client: added sub period to receiver, fixed eiger subperiod updates to client, added subperiod and subexptime to users, fixed hdf5 warnings 2018-05-17 12:34:18 +02:00
5b01b4cbd8 Merge branch 'developer' into esrfchanges 2018-05-02 16:57:03 +02:00
501d2478a5 Merge branch 'jungfraunew' into esrfchanges 2018-04-26 16:37:33 +02:00
08b6eb78c5 gui: always mask out gain bit for jungfrau, even if missing packet 2018-04-26 16:32:03 +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
a09c2e38a3 storage cell fix in gui for non jungfrau detectors 2018-04-25 17:03:25 +02:00
c35203ebfb fixed gitinfo 2018-04-23 14:19:55 +02:00
e024774323 added storage cells 2018-04-13 15:05:43 +02:00
3831896a78 Merge branch 'developer' into zmqhandler 2018-04-09 11:13:37 +02:00
9847729f3c gap pixels included in gui 2018-04-09 11:13:20 +02:00
8cf6e0cbd6 in between 2018-04-06 17:48:10 +02:00