|
|
6be47d936f
|
conflicts resolved
|
2019-02-14 17:32:33 +01:00 |
|
|
|
9aaca14b01
|
CMakeLists.txt: reordering and removing those we dont use anymore, removed all the Makefiles (except the ones for the detector servers)
|
2019-02-14 16:15:43 +01:00 |
|
Erik Frojdh
|
d46d96ecca
|
fixed linking zmq
|
2019-02-13 15:35:40 +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 |
|
|
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +02:00 |
|
|
|
f7a6938366
|
client moved everythign from common files to slsSupportLin/include
|
2018-10-08 10:45:56 +02:00 |
|
|
|
70f55ff788
|
removed MySocketTCP.cpp
|
2018-10-08 10:24:57 +02:00 |
|
|
|
757bc89d05
|
moved common files outside slsDetectorSoftware
|
2018-10-02 16:07:53 +02: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 |
|
|
|
252e924f92
|
separated start gui button into start and stop to prevent multiple click syndrome
|
2018-03-27 17:49:01 +02:00 |
|
|
|
fe2ba8621b
|
updating versioning to only have date
|
2018-03-27 11:00:15 +02:00 |
|
|
|
b029f1fa26
|
Common mode added, working for gotthard double modules
|
2018-03-26 09:07:27 +02:00 |
|
|
|
dd6301d66d
|
updated for compilation
|
2018-03-14 16:19:30 +01:00 |
|
|
|
b58c3e8951
|
solving merging conflicts from 3.1.0 to developer
|
2018-03-14 15:45:35 +01:00 |
|
|
|
72970c9669
|
updated binaries, updated manuals, updated git versioning
|
2018-03-12 14:21:02 +01:00 |
|
|
|
deb59530ab
|
eiger gui fix: delay after trigger and number of gates upon measurements tab refresh doesnt exist for eiger/jungfrau
|
2018-03-08 15:49:01 +01:00 |
|
|
|
61e7c0148f
|
updating versions to 3.1.0
|
2018-02-27 12:40:53 +01:00 |
|
|
|
64c18469bd
|
release changes, gui compile via anaconda changes
|
2018-02-27 10:29:56 +01:00 |
|
|
|
ac9d9f6a93
|
removing --f from the gui options help, bugfix gotthard auto to trigger to auto mode and changing tabs will result in num gates and delay being enabled
|
2018-02-26 16:58:45 +01:00 |
|
|
|
7859df6aa3
|
bug fix: 1000+ errors on gui startup(setreceiveronline not done), removed gui mesage popup for different output paths, fixed jungfrau to have multiple detectors in x dir in gui
|
2018-02-26 12:44:32 +01:00 |
|
|
|
bacc4073f7
|
png compile fails in gui, removing it from cmakelists.txt in gui
|
2018-02-23 14:10:53 +01:00 |
|
Erik Frojdh
|
a536f8ac9b
|
added png and Qt in CMakesList for gui
|
2018-02-19 17:44:57 +01:00 |
|
Erik Frojdh
|
bc6fc51f6a
|
linking cmake
|
2018-02-12 19:15:12 +01:00 |
|
