128 Commits

Author SHA1 Message Date
Dhanya Maliakal
fa0580ccac to see the frames 2016-11-02 11:01:59 +01:00
Dhanya Maliakal
4035f9263a got rid completely of threaded proccessing 2016-11-02 07:28:29 +01:00
Dhanya Maliakal
7fc82723b5 some changes 2016-11-01 14:04:31 +01:00
Dhanya Maliakal
64965e2a1a check for why gui doesnt show all data 2016-10-25 15:53:04 +02:00
Dhanya Maliakal
51c0ca8c6e check for why gui doesnt show all data 2016-10-25 15:50:35 +02:00
Dhanya Maliakal
ac4c758636 check for why gui doesnt show all data 2016-10-25 15:44:31 +02:00
Dhanya Maliakal
899adbce5b merge fixed 2016-10-20 09:17:32 +02:00
Dhanya Maliakal
12574f4c05 merged zmqdata to developer 2016-10-20 08:46:48 +02:00
Dhanya Maliakal
44a69e2aee improved locking a bit 2016-10-19 10:46:03 +02:00
Dhanya Maliakal
a7e8ff1c42 back 2016-10-18 14:05:05 +02:00
Dhanya Maliakal
eec812f92c switched 2016-10-18 12:33:47 +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
9f28cc686c done 2016-10-18 11:10:42 +02:00
Dhanya Maliakal
1bade91254 almost there 2016-10-18 08:43:16 +02:00
Dhanya Maliakal
6751132466 works 2016-10-07 14:26:41 +02:00
Dhanya Maliakal
125c3a789a locking improved 2016-10-07 11:56:04 +02:00
Dhanya Maliakal
1545d37f36 some changes for quitting gui and continuing with acquire from command line 2016-10-07 11:40:51 +02:00
Dhanya Maliakal
dc16d52d49 switching off gui, and acqire should work 2016-10-07 10:21:22 +02:00
Dhanya Maliakal
6da59ca382 somewhere, but weird threads 2016-10-05 15:26:58 +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
f517eb7a41 included json example with dummy values 2016-09-16 17:19:37 +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
0f9a841c4a almost done 2016-09-15 10:17:16 +02:00
Dhanya Maliakal
652d29f2d9 almost done 2016-09-09 17:51:36 +02:00
Dhanya Maliakal
fed40b02c4 fixed measurement progress bar bug that kepts getting reset for each measurement 2016-02-05 11:29:02 +01:00
Dhanya Maliakal
6cc22a350d Merge branch 'release' into jungfrauv1.0 2016-02-03 15:05:50 +01:00
Dhanya Maliakal
d6c4ec184a should show progress for each measurement, not collectively 2015-12-15 14:25:53 +01:00
Dhanya Maliakal
0958a4544e jungfrau works 2015-11-27 15:56:29 +01:00
Dhanya Maliakal
5012ea0c6c unnecessary lock in acquire 2015-11-24 13:50:42 +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
291fe8bc22 socket disconnecting in receiver 2015-11-19 11:10:59 +01:00
Dhanya Maliakal
c43af96487 some changes refactoring and reducing time spent 2015-11-13 17:47:44 +01:00
Dhanya Maliakal
62c92dd364 changing to random read when no gui at beginnning of acquire 2015-11-12 15:05:56 +01:00
Dhanya Maliakal
704c0f796a reset acquiringDone before acquistion 2015-08-19 16:56:17 +02:00
Dhanya Maliakal
24dcc45f5b receiver crash solved 2015-07-24 10:45:11 +02:00
Dhanya Maliakal
a8fc34c92b included propix for client 2015-07-21 16:26:50 +02:00
Dhanya Maliakal
a3a2db1f73 fixed 32 progress problem, and increased debugging 2015-06-30 17:20:23 +02:00
1edcdff936 Updates for JCTB: adcvpp, save parameters. jungfrauDetectorServer works with JMCBv0.1 2015-03-31 13:54:59 +02:00
Dhanya Maliakal
7a2e42d59a changed the way gui polls receiver for data for nth frame and otherwise 2015-03-10 15:03:08 +01:00
Dhanya Maliakal
d658799b20 eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing 2015-02-23 15:18:02 +01: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
bergamaschi
2609e249ab Solved problem with MYTHEN readout
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@820 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-17 14:23:42 +00:00
l_maliakal_d
26c0520c10 semaphore just to check when it is over
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@734 951219d9-93cf-4727-9268-0efd64621fa3
2014-02-06 17:25:18 +00:00
l_maliakal_d
8e24fc7ef9 changes to receiver works for data compression. needs optimizing
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@699 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-28 14:31:03 +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
0202d16d48 some more changes to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@692 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-14 14:18:30 +00:00