340 Commits

Author SHA1 Message Date
Dhanya Maliakal
3fa5191705 so that the dacs dont go negative in the gui, default timer reduced to 200ms so more frames can be shown 2015-02-23 15:26:14 +01:00
Maliakal Dhanya
4a755d96ce revision update 2015-01-14 10:43:41 +01:00
Maliakal Dhanya
8dc41efad2 changed to linux argument type with -- 2014-12-01 10:54:31 +01:00
9b8325bd37 Merge branch 'master' into eiger_receiver 2014-11-17 15:04:42 +01:00
Maliakal Dhanya
5acb1419af the version given to esrf 2014-10-16 14:14:34 +02:00
3d4b2e9fee Merge branch 'eiger_receiver_temp' into eiger_receiver
Conflicts:
	client/Makefile
2014-09-12 16:22:59 +02:00
13a54224eb updating makefiles 2014-09-12 16:22:22 +02:00
056fb4e119 updating Makefile 2014-09-12 13:47:19 +02:00
Maliakal Dhanya
baf65e8318 some clone changes and setting the gui image read frequency to be one for eiger in gui 2014-09-10 14:39:02 +02:00
Maliakal Dhanya
92c56739d9 version 2014-09-09 17:01:25 +02:00
Maliakal Dhanya
0d66e62d10 fixed histogram for trimbits and threshold 2014-09-09 15:46:36 +02:00
Maliakal Dhanya
705a25c9e0 fixed moench dac error 2014-08-29 16:42:26 +02:00
Maliakal Dhanya
c33657f04d histogram for 2d and s curves 2014-08-05 11:30:36 +02:00
Maliakal Dhanya
8a26eef0bf scans for 2d detectors should read every frame 2014-07-31 12:14:09 +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
Maliakal Dhanya
4d9bbeecc3 eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working 2014-07-02 10:57:03 +02:00
Maliakal Dhanya
b256e0b9e3 included eiger dacs to gui 2014-06-18 16:39:11 +02:00
Maliakal Dhanya
0eaecc0e12 git version history 2014-06-03 13:56:39 +02:00
Maliakal Dhanya
c985124b51 git version history 2014-06-03 12:07:35 +02:00
Maliakal Dhanya
891c67f3d0 added gitignore for gui 2014-05-23 14:52:12 +02:00
Maliakal Dhanya
ea1878f848 changes in makefile to make a separate receiver 2014-05-20 17:17:20 +02:00
l_maliakal_d
9c5e2aa5b7 compiling with and without root defined in makefile.include
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@269 af1100a4-978c-4157-bff7-07162d2ba061
2014-04-09 10:29:11 +00:00
l_maliakal_d
02c4a5e18e Makefile sala refined
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@268 af1100a4-978c-4157-bff7-07162d2ba061
2014-04-07 15:50:23 +00: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
ef983c151f small variation
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@266 af1100a4-978c-4157-bff7-07162d2ba061
2014-03-26 10:07:27 +00:00
l_maliakal_d
36171dc5a0 changed #triggers to #frames for trigger frame and trigger window for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@265 af1100a4-978c-4157-bff7-07162d2ba061
2014-03-13 14:19:43 +00:00
l_maliakal_d
6d708e620a changed #triggers to #frames for trigger frame and trigger window for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@264 af1100a4-978c-4157-bff7-07162d2ba061
2014-03-13 14:13:58 +00:00
l_maliakal_d
c338de941d bug fix changing prbes did not change other items as planned, signal lost
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@263 af1100a4-978c-4157-bff7-07162d2ba061
2014-03-04 14:18:07 +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
d0b12f4197 fixed a bug in measurement tab
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@261 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-12 09:23:56 +00:00
l_maliakal_d
69524e61f4 does not refresh measurement tab upon clicking start
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@260 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-10 17:01:34 +00: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
f768886308 tried to reduce the time to refresh measurement and settings tab
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@258 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-07 12:33:07 +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
28e0cae2e2 rescaled histogram plotting
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@256 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-04 11:22:58 +00:00
l_maliakal_d
32e4af910d to reduce warning in between plotting
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@255 af1100a4-978c-4157-bff7-07162d2ba061
2014-02-03 13:10:53 +00:00
l_maliakal_d
922c7ede92 removed an extra settings check
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@254 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-31 16:32:31 +00:00
l_maliakal_d
78e6dccf46 fixed angular conversion crashing problem and got rid of unnecssary prints
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@253 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-31 14:12:14 +00:00
l_maliakal_d
f738b218e1 svn rev updates
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@252 af1100a4-978c-4157-bff7-07162d2ba061
2014-01-30 17:52:00 +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
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
6956ee3164 getting back to basics in zooming, using a flag to check for angle error
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@247 af1100a4-978c-4157-bff7-07162d2ba061
2013-11-25 16:00:35 +00:00
l_maliakal_d
9f92f5cffa getting back to basics in zooming, using a flag to check for angle error
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@246 af1100a4-978c-4157-bff7-07162d2ba061
2013-11-25 15:59:30 +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
c32acebc35 fixed problem of period beign recalculated for each refresh
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@244 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-10 09:09:55 +00:00
l_maliakal_d
b9fcbf4697 changed order to pedestal binary then accumulate, also fxed a bug in that
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@243 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-09 10:37:49 +00:00
l_maliakal_d
c7bc397098 changed 1d line color to black
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@242 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-04 08:58:10 +00:00
l_maliakal_d
4c662270cd fixed zooming problem
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@241 af1100a4-978c-4157-bff7-07162d2ba061
2013-10-02 16:41:50 +00:00