389 Commits

Author SHA1 Message Date
33f5253831 QIP 2019-06-21 18:19:39 +02:00
f4bc255f2c WIP 2019-06-19 15:01:57 +02:00
d2280b4414 WIP 2019-06-19 15:01:18 +02:00
332e83d43c WIP, except qdrawplot 2019-06-18 18:06:27 +02:00
3f4dda9d33 WIP 2019-06-18 17:53:07 +02:00
e4190285be WIP 2019-06-18 17:51:28 +02:00
0acf97cc9a WIP 2019-06-18 16:24:59 +02:00
976b460e70 WIP 2019-06-17 17:54:12 +02:00
326b14737f WIP 2019-06-17 15:51:17 +02:00
4213a161fe WIP 2019-06-14 16:38:42 +02:00
5d2567005d WIP 2019-06-12 14:40:04 +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
235002cdd4 gui: fixed title height 2018-09-20 14:48:36 +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
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
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
563b1bb8b7 slsDetectorGui:added subexptime and subperiod to gui 2018-05-17 15:34:35 +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
a09c2e38a3 storage cell fix in gui for non jungfrau detectors 2018-04-25 17:03:25 +02:00
e024774323 added storage cells 2018-04-13 15:05:43 +02:00
9847729f3c gap pixels included in gui 2018-04-09 11:13:20 +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
b58c3e8951 solving merging conflicts from 3.1.0 to developer 2018-03-14 15:45:35 +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
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
897cbac27d merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file 2018-02-07 11:02:36 +01:00
ecf1e9fac1 bugfix: returning pointer to local variable, char* to string in function definition 2018-02-07 10:14:52 +01:00
Dhanya Maliakal
d6bdbf8524 Merge branch '3.0.1' into developer 2017-12-11 13:51:20 +01:00