detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 19:30:03 +02:00
Code Issues Actions Packages Releases Activity
5,659 Commits 43 Branches 100 Tags
Commit Graph

112 Commits

Author SHA1 Message Date
Erik Frojdh
bd47c969dd WIP 2020-03-09 12:49:24 +01:00
Dhanya Thattil
6a0a931e3e gotthard2: bursts and burst period, written to same register as triggers and delay (kept in server as variables) and set if conditions meet. bursts and burst period only in auto timing and burst mode. Also updating theses registers when switching between timing modes or burst modes 2020-02-25 15:45:40 +01:00
Dhanya Thattil
f902bb06ad gui bug fix: trigger timing mode was disconnected 2020-02-24 17:40:00 +01:00
Dhanya Thattil
995f0924e5
Commandline (#66) 
* WIP

* WIP

* removed status to string from defs

* WIP

* WIP

* WIP removed unused functions in multi

* WIP

* print hex in a terrible way

* WIP, loadconfig error

* WIP, type to string

* WIP

* fix to conversion

* WIP, hostname doesnt work

* WIP

* WIP

* WIP

* WIP, threshold

* WIP, threshold

* WIP

* WIP, triggers

* WIP, cycles to triggers

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* rx_udsocksize fx, WIP

* WIP

* WIP

* WIP

* file index (64 bit), WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* merge

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* New python mod
 2019-10-21 10:29:06 +02:00
Dhanya Thattil
fc0b25cfa7 gui bug fix: hostname print out and acquisition index 2019-08-27 09:25:10 +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
Dhanya Thattil
a0bdfcdae3 WIP 2019-08-16 17:38:41 +02:00
Dhanya Thattil
6e4e2c4524 Startingfnum (#40) 
* starting fnum

* by default starting fnum disabled in gui

* insignificant change

* adding binary

* virtual eiger server working now

* test:: namespace
 2019-07-23 14:15:08 +02:00
Dhanya Thattil
c582ba15d5 WIP 2019-07-04 16:40:25 +02:00
Dhanya Thattil
6a60f7d222 WIP 2019-07-03 18:21:44 +02:00
Dhanya Thattil
864db79a13 WIP 2019-07-02 17:11:03 +02:00
Dhanya Thattil
455252f2f3 WIP 2019-07-02 13:51:31 +02:00
Dhanya Thattil
5e6eb45f56 Merge branch 'gui' of github.com:slsdetectorgroup/slsDetectorPackage into gui 2019-07-02 13:51:03 +02:00
Dhanya Thattil
975076043f WIP 2019-07-02 13:50:20 +02:00
Erik Frojdh
cbe979b4b9 fixed merge 2019-07-02 12:16:05 +02:00
Erik Frojdh
44aa3f655b cmath + cleaning 2019-07-02 12:11:45 +02:00
Dhanya Thattil
fc2cc7e00c WIP 2019-07-02 12:09:37 +02:00
Dhanya Thattil
e22d03a744 WIP 2019-07-02 09:13:47 +02:00
Dhanya Thattil
a373609b08 WIP 2019-06-28 18:16:32 +02:00
Dhanya Thattil
039a725c5c WIP. removed qServer 2019-06-28 11:57:37 +02:00
Dhanya Thattil
06834617de WIP 2019-06-27 11:54:17 +02:00
Dhanya Thattil
61b937e2e0 WIP. catching exceptions using macros to ignore socket and shm error 2019-06-25 17:27:30 +02:00
Dhanya Thattil
33f5253831 QIP 2019-06-21 18:19:39 +02:00
Dhanya Thattil
0acf97cc9a WIP 2019-06-18 16:24:59 +02:00
Dhanya Thattil
1bab010d0b WIP 2019-06-11 10:15:40 +02:00
Dhanya Thattil
f0872174cf WIP 2019-06-07 18:53:57 +02:00
Dhanya Thattil
862dc824ba WIP 2019-06-05 11:27:19 +02:00
Dhanya Thattil
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
Dhanya Thattil
e024774323 added storage cells 2018-04-13 15:05:43 +02:00
Dhanya Thattil
252e924f92 separated start gui button into start and stop to prevent multiple click syndrome 2018-03-27 17:49:01 +02:00
Dhanya Thattil
b58c3e8951 solving merging conflicts from 3.1.0 to developer 2018-03-14 15:45:35 +01:00
Dhanya Thattil
deb59530ab eiger gui fix: delay after trigger and number of gates upon measurements tab refresh doesnt exist for eiger/jungfrau 2018-03-08 15:49:01 +01:00
Dhanya Thattil
ac9d9f6a93 removing --f from the gui options help, bugfix gotthard auto to trigger to auto mode and changing tabs will result in num gates and delay being enabled 2018-02-26 16:58:45 +01:00
Dhanya Maliakal
385e6714cc merge conflict from 3.0.1 to restream stop from recieveR 2017-11-30 19:05:19 +01:00
Dhanya Maliakal
baee38802b wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it 2017-11-30 16:20:26 +01:00
Dhanya Maliakal
4159e83fd6 making gui work temporarily for jctb 2017-11-22 09:27:01 +01:00
Dhanya Maliakal
d7137e0c75 fixed segmentation fault issue of xputsn the right way, fixed warnings 2017-11-17 09:26:05 +01:00
Dhanya Maliakal
73c97f1381 solved many bugs, but cannot get data in eiger 2017-06-09 16:05:40 +02:00
Dhanya Maliakal
96d8478b46 gui ensuring receiver offline caught, also at progress 2016-11-22 13:59:27 +01: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
b803f3a32a works for jungfrau 2015-11-27 17:30:45 +01: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
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
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
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
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
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