139 Commits

Author SHA1 Message Date
Dhanya Maliakal
6da59ca382 somewhere, but weird threads 2016-10-05 15:26:58 +02:00
Dhanya Maliakal
984698efad merged with developer a lot of bug fixes from 14 sep to 30 sep 2016-10-04 13:36:04 +02:00
Dhanya Maliakal
5f4a4b0d90 maybe fixed 16 bit rate corr eiger 2016-09-23 17:15:16 +02:00
Dhanya Maliakal
d0501c3139 creating and destroying sockets for each receiver start and stop in a single acquisition (to deal with scans etc) 2016-09-21 16:37:29 +02:00
Dhanya Maliakal
a1df8bdc15 done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc 2016-09-20 15:11:39 +02:00
Dhanya Maliakal
1263e80d21 done 2016-09-16 12:49:27 +02:00
Dhanya Maliakal
1da4b07e73 works, need to do json header and send dataready 2016-09-15 17:15:55 +02:00
Dhanya Maliakal
a821442b1a almosst 2016-09-15 12:16:01 +02:00
Dhanya Maliakal
652d29f2d9 almost done 2016-09-09 17:51:36 +02:00
Dhanya Maliakal
29ba1f4042 changed transmission delay commands to go through network parameters and included 10g flow control 2016-08-04 17:21:16 +02:00
Dhanya Maliakal
d28d737fb9 transmission delay added 2016-08-03 17:03:37 +02:00
Dhanya Maliakal
c0db1a89a8 deactivate for eiger 2016-08-02 10:32:37 +02:00
Dhanya Maliakal
6823e3065b feature: tau is now read from calib file. if not there, it is set to defalt in server value, but switched off. load trimbits will not touch rate correction 2016-07-05 12:01:41 +02:00
Dhanya Maliakal
5af05c24c1 added iodelay with setttings 2016-02-24 18:05:17 +01:00
Dhanya Maliakal
c097dfc8b3 two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc 2015-11-20 16:28:48 +01:00
Dhanya Maliakal
e0464ef782 pulsing client side, and bug fix server side for reset partially 2015-11-19 16:15:59 +01:00
Dhanya Maliakal
8b0895add0 reset counter bit in eiger detector partially or completely 2015-11-17 16:39:36 +01:00
Dhanya Maliakal
66db11421f implemented fifo depth configurable from client 2015-11-17 10:30:53 +01:00
Dhanya Maliakal
a770389c90 including subframe index from receiver to client and also sending this to gui 2015-09-23 11:50:02 +02:00
Dhanya Maliakal
584b9e6036 added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger 2015-09-04 15:54:12 +02:00
84ad2912c6 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-08-28 10:55:22 +02:00
Dhanya Maliakal
0d83346943 continuous and storeinram variable 2015-07-24 09:21:38 +02:00
de0f35afb3 some jctb changes 2015-06-12 13:00:13 +02:00
ba377ec273 Command adcreg added to write to adc registers 2015-05-04 13:48:46 +02:00
Dhanya Maliakal
7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01:00
Dhanya Maliakal
85ccf64175 print receiver configurations for all detectors added 2015-03-02 13:56:23 +01:00
327c2106df Some fixes for the CTB 2014-10-14 17:43:25 +02:00
308b3aa9b1 Client and jungfrau server funcs added for pattern generator 2014-10-14 17:03:13 +02:00
Maliakal Dhanya
d8c7201749 module udpport2 2014-09-26 11:18:59 +02:00
Maliakal Dhanya
7e46a407c6 added trimval function, but sending trimbits from char to int bug 2014-07-21 16:39:36 +02:00
Maliakal Dhanya
828a2dbd17 10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file 2014-07-11 13:06:48 +02:00
Maliakal Dhanya
018b800117 eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working 2014-07-02 10:55:32 +02:00
l_maliakal_d
8b833b0f7e removed salas code for the time being, implemented overwrite, fixed prob of communciating between detector and receiver for settimer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@803 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-25 15:32:12 +00:00
l_maliakal_d
f854477aae implemented sending hostname to the receiver for eiger
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@764 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 10:49:35 +00:00
l_maliakal_d
a892a8854c compression extended to client side with r_compression
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@742 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-24 14:58:36 +00:00
bergamaschi
1ed2ba63b5 solved bug on the number of chans of multiSlsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@697 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-21 15:57:57 +00:00
l_maliakal_d
57d65fd59c semaphores , no usleep in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@660 951219d9-93cf-4727-9268-0efd64621fa3
2013-09-04 13:10:14 +00:00
l_maliakal_d
666c73c988 edited call backs in receiver, got rid of uhrix callback, expose receiver read freq to user, got rid of wait for receiver t finish
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@577 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-27 09:11:26 +00:00
l_maliakal_d
0e73372cf8 receiver read frequency from gui can be set now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@567 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 13:43:25 +00:00
l_maliakal_d
1eae11a87a fixed the undefined state of gui when acquisition stopped
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@545 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-07 14:20:01 +00:00
l_maliakal_d
3ac133db98 updated nchip to be defined in x and y directions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@543 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-06 16:45:50 +00:00
l_maliakal_d
f0e30926fe fixed part of mythen module 6 problem: offsets should be updated after set nmod, still need to fix numchips in one direction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@542 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-06 16:23:13 +00:00
l_maliakal_d
ca15ff971d added nchans for each dimension and edited update offsets to work better for 2d dets
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@514 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-16 13:39:58 +00:00
l_maliakal_d
27c91c36ff moench client and receiver works with gotthard module, without gui
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@511 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-12 12:54:36 +00:00
l_maliakal_d
778cd97317 started the basics for sending every nth frame from receiver to gui.incomplete and will be implemented later
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@506 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:00:44 +00:00
l_maliakal_d
1f15f7d5cb every function call in slsdetector also sets error mask if it was online and failed to connect
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@492 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-14 11:31:10 +00:00
l_maliakal_d
1882454cf3 udpip and hostname order for write config,receiver returns quicker when no data or mismatched indices
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@491 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-13 15:34:53 +00:00
l_maliakal_d
3075b8ae11 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/slsDetectorSoftware@471 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-26 08:34:41 +00:00
l_maliakal_d
5335e82100 included setroi for multidet
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@466 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:55:11 +00:00
l_maliakal_d
4a4efda69f added calibrate pedestal for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@456 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 10:45:41 +00:00