|
|
d2d25cdd69
|
WIP
|
2019-06-11 11:19:07 +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 |
|
|
|
c30485a65b
|
advanced down
|
2019-05-08 16:44:08 +02:00 |
|
|
|
89a06f099c
|
merging refactor (replacing)
|
2019-04-12 10:53:09 +02:00 |
|
|
|
80c0d4e10e
|
gui: bug fix advanced tab (network and trimming) was a mess
|
2018-09-25 18:00:21 +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 |
|
|
|
563b1bb8b7
|
slsDetectorGui:added subexptime and subperiod to gui
|
2018-05-17 15:34:35 +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 |
|
Dhanya Maliakal
|
e29371ca8d
|
makng the zmq work without external flag
|
2017-11-27 17:06:11 +01:00 |
|
Dhanya Maliakal
|
d23c9d52ed
|
somewhere
|
2017-11-23 14:53:33 +01:00 |
|
Dhanya Maliakal
|
9c55cb4974
|
removed merge conflicts from bug fix of zmq buffering while acquire from command line
|
2017-11-21 14:57:52 +01:00 |
|
Dhanya Maliakal
|
49ba893d7e
|
zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same
|
2017-11-21 13:38:31 +01:00 |
|
Dhanya Maliakal
|
70e4c6e2a2
|
zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:37:00 +01:00 |
|
Dhanya Maliakal
|
28e2ebf75a
|
merge conflict resolved from 3.0.1
|
2017-11-17 09:40:42 +01:00 |
|
Dhanya Maliakal
|
065b4a8e0f
|
including zmq port change in gui
|
2017-11-16 13:50:30 +01:00 |
|
Dhanya Maliakal
|
0e8d2de253
|
somewhere
|
2017-11-16 09:12:49 +01:00 |
|
Dhanya Maliakal
|
8872f86e31
|
Merge branch '3.0.1' into developer
|
2017-11-13 15:32:47 +01:00 |
|
Dhanya Maliakal
|
52a9303a5e
|
removed compression from gui in expert mode
|
2017-11-13 15:32:24 +01:00 |
|
Dhanya Maliakal
|
b78dcf869b
|
Merge branch '3.0' into developer
|
2017-09-15 13:27:18 +02:00 |
|
Dhanya Maliakal
|
bcea5a99a1
|
1. bug fix: loading trimbits and gui complains of different trimbits and sets them all to zero. This is fixed. It just loads -1 to gui. 2. Advanced Tab made slightly better aligned
|
2017-09-15 09:36:44 +02:00 |
|
Dhanya Maliakal
|
277dc2cfd9
|
gainplot added for jungfrau, aspect ratio check in gui added, npixels-1 as endpixel bug fix
|
2017-09-01 12:03:09 +02:00 |
|
Dhanya Maliakal
|
c31ee2d76f
|
allowing -1 in gui for spinbox
|
2017-08-04 14:20:51 +02:00 |
|
Dhanya Maliakal
|
91f8987b6c
|
removed ui include files as they are generated anyway for every make
|
2017-07-26 11:12:56 +02:00 |
|
Dhanya Maliakal
|
5771a3c722
|
includes in gui
|
2017-07-25 13:56:27 +02:00 |
|
Dhanya Maliakal
|
68cbb63355
|
adding the form include files back into git
|
2017-07-25 12:15:58 +02:00 |
|
Dhanya Maliakal
|
8ebbfbb84b
|
incl. prev commit: Included file overwrite, format and changed the functonality of filewrite enable and file path
|
2017-03-10 12:21:19 +01:00 |
|
Dhanya Maliakal
|
2ef44ec70b
|
somewhere
|
2017-03-10 10:51:47 +01:00 |
|
Dhanya Maliakal
|
4c2d28943f
|
rate correction fixed for gui, removed auto made it defalt
|
2016-08-11 13:59:36 +02:00 |
|
Dhanya Maliakal
|
cf74f9b138
|
fixed rate correction to not include 16 bit dr
|
2016-08-08 15:50:37 +02:00 |
|
Dhanya Maliakal
|
9139451127
|
added 2 gain settings to eigeR
|
2016-08-03 10:34:10 +02:00 |
|
Dhanya Maliakal
|
d4dd7b5d8c
|
added burst_trigger mode for eiger to replace trigger_readout mode
|
2016-07-04 15:44:59 +02:00 |
|
Dhanya Maliakal
|
1633cc3f01
|
incorporated rate correction of eiger into gui
|
2016-02-17 18:04:24 +01:00 |
|
Dhanya Maliakal
|
700346fbbe
|
some changes for gui for settings for jungfrau
|
2015-12-01 17:15:41 +01:00 |
|
Dhanya Maliakal
|
754d0b7911
|
included set all trimbits
|
2015-09-10 12:53:18 +02:00 |
|
Dhanya Maliakal
|
1c41ea8898
|
changes to includes clkdivider and flags in gui
|
2015-09-10 11:28:39 +02:00 |
|
Maliakal Dhanya
|
c33657f04d
|
histogram for 2d and s curves
|
2014-08-05 11:30:36 +02:00 |
|
Maliakal Dhanya
|
7c58d3db46
|
enabling 10Gbe for eiger, advanced settings and also mV for dacs for all detectors
|
2014-07-11 12:56:11 +02:00 |
|
l_maliakal_d
|
bf2d8937f4
|
got rid of trigger frame and trigger window to merge with other timing modes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@267 af1100a4-978c-4157-bff7-07162d2ba061
|
2014-03-26 14:06:59 +00:00 |
|
l_maliakal_d
|
e7d22b1b39
|
compression enabled in gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@262 af1100a4-978c-4157-bff7-07162d2ba061
|
2014-02-27 10:53:27 +00:00 |
|
l_maliakal_d
|
5c1574ec90
|
updated binary of 2d to be negative an update the label enabling before each acquisition if disabled
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@248 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-11-25 16:57:57 +00:00 |
|
l_maliakal_d
|
d421c0c9fe
|
checked in threshold changes to binary
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@245 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-10-14 08:33:40 +00:00 |
|
