83 Commits

Author SHA1 Message Date
5be503c1bd
moench speeds (#776)
* added other speeds and updated readoutspeedlist, test, gui
2023-07-10 15:09:51 +02:00
65b8c9c5c1
Moench rw3 (#745)
* moench, removed chip version, filter resistor, filter cells, currentsoures, gain mode, setttings(modes), dbitphase, maxdbitphase, autocompdisable, comparatordisabletime, made acq start and stop a pulse, removed unused registers

* added parallel command

* remove gain plot for moench

* moench: updated adc invert val

* moench: update adcoffset to 0xf and adcphase to 140 degrees

* removed sync clock in moench

* updated min fw version

* removing config file in moench server
2023-05-25 11:00:23 +02:00
dc5db905d4 merge from 7.0.0 2023-02-24 10:39:51 +01:00
Dhanya Thattil
878eab9fc3
Fix gui browse (#662)
Choosing file path in dialog should already set file path when returning from dialog, must not wait to press enter
2023-02-20 15:20:02 +01:00
Dhanya Thattil
39b1f5bbf2
Moench rewrite (#597)
* copied jungfrau server to moench and adapted

* fixed image size and num packets

* read n rows allows 16

* commneted out configure_asic_timer at server startup. To be removed later the ASIC_CTRL_REG and storage cell options

* moench:removing the decrement (which was in jf)  in read n rows to register

* removed lblsamples from gui
2022-12-15 09:16:51 +01:00
Dhanya Thattil
38cd10d4e6
Qt5 built in qwt (#570)
- qt4->qt5
- in built qt5 6.1.5 because rhel7 is not upto date with qt5, removed findqwt.cmake
- made a fix in qwt lib (qwt_plot_layout.h) to work with 5.15 and lower versions for qrect constr.
- qt5 forms fixed, qt4 many hard coding forms switched to forms including qtabwidget, scrolls etc, fonts moved to forms
 - docking option enabled by default, removed option to disable docking feature from "Mode"
- added qVersionResolve utility functions to handle compatibility before and after qt5.12
- qtplots (ian's code) takes in gain mode enable to set some settings within the class, with proper gain plot ticks
- ensure gain plots have no zooming of z axis in 2d and y axis in 1d
- removed placeholder text in qpalette in main window form as its not supportd until 5.12 (so using qt5.9 designer insted of qt5.15 to cope)
- tab order
Servers:
- fixed some error messages that were empty for fail in funcs (mostly minor as if this error, major issues)
2022-11-11 15:15:10 +01:00
Dhanya Thattil
6bf9dbf6d3
Format (#506)
Formatted package
2022-08-05 15:39:34 +02:00
Dhanya Thattil
4259363169
rxr sls namespace (#457)
* rxr src files and classes (detectordata, ZmqSocket) added to sls namespace

* moving defines inside namespace

* moving defines inside namespace, added helpdacs to namespace

* added namespace to gui

* gui also updated

* removed unnecessary sls:: when already in sls namespace for slsDetectoSoftware, receverSoftware, slsDetectorGui and slsSupportlib
2022-05-18 11:48:38 +02:00
b39c64032d clang format 2021-10-19 14:49:43 +02:00
dac60ad76d added .cpp licenses 2021-10-15 15:47:04 +02:00
9b9bc3ffb9 bugfix to gui and updating gui about 2021-10-08 18:57:04 +02:00
8e09b50c5e python and gui fix for parallel, gui: clkdivider also for jungfrau and parallel also for m3 2020-09-08 16:53:42 +02:00
Dhanya Thattil
180c7b7191
Gui slot call focus fix (#150)
* fix for editingFinished for qlineedit using isModified()

* spinbox disable keyboard tracking to use valuechanged so slot called only after editing finished, focus fix

* return pressed forces qtextfield to be set (slot for tab checks for modification flag due to avoid unnecessary set when focus). This is to remove inconsistencies from command line. A return should set even if it looks like no modification in gui

Co-authored-by: Erik Fröjdh <erik.frojdh@gmail.com>
2020-09-02 16:56:57 +02:00
Erik Frojdh
8ff9b0cdac format GUI 2020-05-05 10:12:05 +02:00
Erik Frojdh
0de0d82a1a replaced old logger 2020-03-11 12:40:12 +01:00
Erik Frojdh
ee799b540a removed redundant includes etc. 2020-03-10 11:12:00 +01:00
Erik Frojdh
9ede0629ef clang format on gui 2020-03-10 10:18:52 +01:00
Erik Frojdh
bd47c969dd WIP 2020-03-09 12:49:24 +01:00
Dhanya Thattil
5bcde789ac
Readoutflags (#61)
* WIP

* eiger binary back wih versioning

* fixed readout flag in ctbgui, added speedLevel enum

* ctbgui: fixed a print out error

* ctb readout bug fix

* WIP

* WIP

* WIP
2019-09-02 19:27:27 +02:00
Dhanya Thattil
aafe049a9b
Guidetector (#54)
* WIP

* dacWidget

* main WIP

* advanced WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* works

* updated gui to chrono

* review fixes

* unitque ptrs in gui
2019-08-26 19:14:22 +02:00
b2d39d4785 WIP done 2019-08-09 17:19:12 +02:00
1a60b59a48 size 2019-08-09 12:11:42 +02:00
864db79a13 WIP 2019-07-02 17:11:03 +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
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
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
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
b58c3e8951 solving merging conflicts from 3.1.0 to developer 2018-03-14 15:45:35 +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
Dhanya Maliakal
4159e83fd6 making gui work temporarily for jctb 2017-11-22 09:27:01 +01:00
Dhanya Maliakal
52a9303a5e removed compression from gui in expert mode 2017-11-13 15:32:24 +01: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
1633cc3f01 incorporated rate correction of eiger into gui 2016-02-17 18:04:24 +01:00
Dhanya Maliakal
da809171e9 output dir multi for all 2015-10-26 11:31:56 +01:00
Dhanya Maliakal
1c41ea8898 changes to includes clkdivider and flags in gui 2015-09-10 11:28:39 +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
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
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
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
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
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
790966e3dd semaphores , no usleep in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@234 af1100a4-978c-4157-bff7-07162d2ba061
2013-09-04 13:10:18 +00:00