156 Commits

Author SHA1 Message Date
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
l_maliakal_d
a06a4ef8d7 reverted to old version for negative threshold
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@239 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-25 08:50:36 +00:00
cartier_s
5e4e52936b spin poxes can get negative values for binary plotting
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@238 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-24 13:29:06 +00:00
l_maliakal_d
e7633f1e04 let threshold take negative numbers fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@236 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-20 10:25:40 +00:00
l_maliakal_d
22de76c8b0 histogram included, improved ready every frame, and other stuff.. a working version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@230 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-27 15:47:07 +00:00
l_maliakal_d
061bd4251c pedestalbug fixed, trylock changed to lock, binary has qtip
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@228 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-16 13:48:03 +00:00
l_maliakal_d
3c92f26be7 fixed some probelems wuth scans for receiver and also scans for allframes/frameindex
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@227 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-16 12:59:48 +00:00
l_maliakal_d
eb48b1c492 checking if probes or threshold ..shouldnt check if its the wrong detector unnecessary err printouts
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@225 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-12 12:21:49 +00:00
l_maliakal_d
440b244b66 checking conditions before trimming and settings include low noise now, so a few changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@224 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-12 10:28:42 +00:00
l_maliakal_d
f2a77be1b2 layoutthreshold was disabled for mythen, changed that
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@223 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 14:30:10 +00:00
l_maliakal_d
038d3c11df set maximum number for probes in gui as 3
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@221 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 09:56:15 +00:00
l_maliakal_d
1274b5532c set maximum number for probes in gui as 3
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@220 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 09:54:29 +00:00
l_maliakal_d
daae091945 a HUGE number of changes in measurement tab, and changes probes to be still disabled until #frames>1 and set cycles to 1 if probes >1
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@219 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-08 09:53:28 +00:00
l_maliakal_d
d6dccef65c added the tip that probes are enabled only in expert mode
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@218 af1100a4-978c-4157-bff7-07162d2ba061
2013-08-07 09:36:42 +00:00
l_maliakal_d
6ea6f44824 verifying output directory works for receiver based detectors.. before acquisition
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@206 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-23 08:39:15 +00:00
l_maliakal_d
d84f95456b included accumulate, pedestal and binary
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@204 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-17 14:54:42 +00:00
l_maliakal_d
12f48fb0d2 form used ampersand
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@203 af1100a4-978c-4157-bff7-07162d2ba061
2013-07-12 12:44:23 +00:00