|
|
864db79a13
|
WIP
|
2019-07-02 17:11:03 +02:00 |
|
|
|
fc2cc7e00c
|
WIP
|
2019-07-02 12:09:37 +02:00 |
|
|
|
61b937e2e0
|
WIP. catching exceptions using macros to ignore socket and shm error
|
2019-06-25 17:27:30 +02:00 |
|
|
|
33f5253831
|
QIP
|
2019-06-21 18:19:39 +02:00 |
|
|
|
0acf97cc9a
|
WIP
|
2019-06-18 16:24:59 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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
|
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
|
4159e83fd6
|
making gui work temporarily for jctb
|
2017-11-22 09:27:01 +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
|
bbcf75bc09
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:00:59 +01: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
|
b2caec384f
|
removing receiver print config from gui
|
2017-06-21 17:03:41 +02:00 |
|
Dhanya Maliakal
|
2ec1e08081
|
changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui
|
2017-06-19 14:19:30 +02:00 |
|
Dhanya Maliakal
|
73c97f1381
|
solved many bugs, but cannot get data in eiger
|
2017-06-09 16:05:40 +02:00 |
|
Dhanya Maliakal
|
b803f3a32a
|
works for jungfrau
|
2015-11-27 17:30:45 +01:00 |
|
Dhanya Maliakal
|
754d0b7911
|
included set all trimbits
|
2015-09-10 12:53:18 +02:00 |
|
Dhanya Maliakal
|
db5412e599
|
propix integrated into gui
|
2015-07-22 10:06:38 +02:00 |
|
Dhanya Maliakal
|
848569b216
|
print receiver configurations and some error messages upon exit
|
2015-03-02 14:04:27 +01: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
|
7ebd1643ee
|
made measurement tab faster, not too many checks anymore
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@259 af1100a4-978c-4157-bff7-07162d2ba061
|
2014-02-10 16:20:17 +00:00 |
|
l_maliakal_d
|
534be9f942
|
file dialogs now show option to show all files, trimbits is possible to open non existing file, copying clones does not get rid of the old plot
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@257 af1100a4-978c-4157-bff7-07162d2ba061
|
2014-02-05 16:37:05 +00:00 |
|
l_maliakal_d
|
a1c58f152f
|
got rid of unncessary printouts and MyApplication inqDetectorMain does not work.so bak to original
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@251 af1100a4-978c-4157-bff7-07162d2ba061
|
2014-01-30 17:50:41 +00:00 |
|
x04sa
|
635a33ea85
|
fixed bug when trimming
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@250 af1100a4-978c-4157-bff7-07162d2ba061
|
2014-01-28 12:20:43 +00:00 |
|
bergamaschi
|
3731bfd51e
|
removed checkinfinity flags
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@249 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-12-17 10:31:54 +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
|
113ee269d4
|
added trimming checks
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@222 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-08-08 13:39:36 +00:00 |
|
l_maliakal_d
|
9cdbd74471
|
changed the start and stop receiver error messages to be displayed to the client and not jsus recever
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@213 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-07-30 14:50:01 +00:00 |
|
l_maliakal_d
|
e153c6fd58
|
fixed zmin zmax bug, automatically online when refreshing advanced tab bug, outdir not checking properly
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@178 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-05-08 17:32:38 +00:00 |
|
l_maliakal_d
|
c605c77037
|
adjusted gui for moench and proper 2d plots, which are not scans for 1ds
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@172 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-04-16 13:43:28 +00:00 |
|
l_maliakal_d
|
050bec703d
|
defining everything to reduce null pointer errors, fixed zooming problem for scans
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@171 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-04-10 13:34:52 +00:00 |
|
l_maliakal_d
|
9e1029185f
|
check error message in between implemented in gui, also fixed wrong ports being set:control:stop
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@162 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-03-13 15:48:30 +00:00 |
|
l_maliakal_d
|
0682d23abd
|
made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@147 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-02-26 08:34:47 +00:00 |
|
l_maliakal_d
|
4814962347
|
included setroi for multidet
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@145 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-02-21 16:00:44 +00:00 |
|
l_maliakal_d
|
f3eb9c924f
|
included network tab in gui, correctedmulti to be able to clear sls detectors error mask,included coud not set up network parameter error
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@144 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-02-07 17:34:16 +00:00 |
|
l_maliakal_d
|
1d1e5e1202
|
included shortframe in gui for time being its just adc selection
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@142 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-31 15:42:04 +00:00 |
|
l_maliakal_d
|
6b311f931b
|
included shortframe in gui for time being its just adc selection
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@141 af1100a4-978c-4157-bff7-07162d2ba061
|
2013-01-31 15:34:31 +00:00 |
|
