98 Commits

Author SHA1 Message Date
Dhanya Maliakal
a7e8ff1c42 back 2016-10-18 14:05:05 +02:00
Dhanya Maliakal
de5037ae2b switched 2016-10-18 12:19:20 +02:00
Dhanya Maliakal
3a6d97b4f3 trying 2016-10-18 12:08:11 +02:00
Dhanya Maliakal
1bade91254 almost there 2016-10-18 08:43:16 +02:00
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
5c239ad45f data call back form receiver includes both x and y dimensions 2015-12-16 15:01:00 +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
cae286941a added subframe exposure time settable 2015-09-03 15:16:48 +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
9ac08e5e76 supports frames with many samples for jctb - obtained by faking number of chips in case of many samples 2015-01-30 12:58:53 +01:00
308b3aa9b1 Client and jungfrau server funcs added for pattern generator 2014-10-14 17:03:13 +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
Maliakal Dhanya
8788a060dd creating a separate receiver 2014-05-21 09:44:35 +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
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
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
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
6aa90bba79 added default gui server port number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@479 951219d9-93cf-4727-9268-0efd64621fa3
2013-03-01 13:14:47 +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
l_maliakal_d
7a55ed9a74 frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-05 11:23:46 +00:00
l_maliakal_d
a4206208c9 implemented a trial error class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@434 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-22 11:16:37 +00:00
l_maliakal_d
4cc8566311 included a current frame index whch is different than file frame index for gotthard, even when readout through blackfin, for mythen both will alwys be incrememnted by one; gotthard server all of them should be consistent for 32 bit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@425 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 17:20:57 +00:00
l_maliakal_d
a99222cc02 included enable write to file in receiver, changed the enablewritetofie function in postprocessing to be modified by slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@387 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 08:16:29 +00:00
bergamaschi
3422686e51 rev test
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@383 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 10:46:37 +00:00
l_maliakal_d
08b01d6edf checking rev change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@382 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 10:42:26 +00:00
bergamaschi
806df32efb revision in version number in getId
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@378 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 09:28:06 +00:00
bergamaschi
00e9c69bed revision in version number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@377 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-13 09:23:04 +00:00
l_maliakal_d
9341a2875a now u can use receiver hostname instead of only ip, got rid of acqtest, separated udpip and port from setudpconnection
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@372 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-07 15:51:03 +00:00
l_maliakal_d
e490f437a2 get progress when acquisition is over to show 100 percent
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@363 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-30 09:51:05 +00:00
l_maliakal_d
6b935f3bd2 included exitReceiver, using different threads to listen and write packets in receiver, edited circularfifo to use pointer references, and acquire returns frames caught
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@362 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-30 09:28:52 +00:00
l_maliakal_d
e4e46920cd fixed frames from receiver to flip accordingly, also display frame index as not visible from filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@345 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-15 11:19:50 +00:00
l_maliakal_d
8f7872d056 gotthard receiver works so far without cpu file write and tcp generic socket lock
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@337 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-12 15:48:28 +00:00