193 Commits

Author SHA1 Message Date
Dhanya Maliakal
f0ac9a2e9c back to not asking getframescaught 2016-11-01 15:59:43 +01:00
Dhanya Maliakal
1f3a418d93 make t crash 2016-11-01 15:02:14 +01:00
Dhanya Maliakal
7fc82723b5 some changes 2016-11-01 14:04:31 +01:00
Dhanya Maliakal
7374a37115 back with checking online, got rid of getframescaught altogether 2016-11-01 10:03:38 +01:00
Dhanya Maliakal
b28c68127a check for why gui doesnt show all data 2016-10-25 16:48:04 +02:00
Dhanya Maliakal
64094be4e3 check for why gui doesnt show all data 2016-10-25 16:45:52 +02:00
Dhanya Maliakal
9f28cc686c done 2016-10-18 11:10:42 +02:00
Dhanya Maliakal
16adb444b9 changed back the delay between framescaught 2016-10-07 13:12:57 +02:00
Dhanya Maliakal
d54392c6eb increased delay to get framescaught from receiver for acquire form command line 2016-10-07 12:45:34 +02:00
Dhanya Maliakal
de2de6315c somewhere 2016-10-06 08:44:00 +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
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
09d0d3ba22 parallized setup receiver 2016-07-07 15:55:22 +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
7b7d42f253 fixed the 8 byte iodelay trimfile bug, now writes as 4 bytes 2016-03-14 14:39:40 +01:00
Dhanya Maliakal
5af05c24c1 added iodelay with setttings 2016-02-24 18:05:17 +01:00
Dhanya Maliakal
07f1bd5c82 mid way, had to change to fix bug 2016-02-08 10:40:54 +01:00
Dhanya Maliakal
6cc22a350d Merge branch 'release' into jungfrauv1.0 2016-02-03 15:05:50 +01: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
61f0506c2c settings for jungfrau 2015-12-01 16:43:23 +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
5057fd4eef changed energyConversion.h to compile the calibration wizards 2015-09-24 11:10:12 +02:00
11de59d87c Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-09-24 10:54:48 +02:00
33cf26648b no real changes 2015-09-24 10:54:43 +02: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
681ed0f34f added function to read 4 energy calibration coefficients for eiger, comments on how to add them to the software 2015-09-03 15:39:54 +02:00
Dhanya Maliakal
8ebb34dd42 fixed long file names in guireducing redundancy in name 2015-08-28 10:23:21 +02:00
Dhanya Maliakal
f546814d39 reduced size of file names in gui 2015-08-27 10:44:24 +02:00
Dhanya Maliakal
2f160a7c28 reordered file name positions for gemma 2015-08-26 16:47:18 +02:00
Dhanya Maliakal
df1453568c reverted the file name indices positioning as it doesnt work for gui 2015-08-26 12:50:45 +02:00
Dhanya Maliakal
79e13c6db7 using framescaught instead of frameindex in gui to get data 2015-08-19 15:48:14 +02:00
Dhanya Maliakal
225b67f5e5 some bug fix with file naming from previous change 2015-08-19 11:46:41 +02:00
Dhanya Maliakal
c9a952a748 changing file name prefix orders, reset frames caught command from command line 2015-08-19 11:38:09 +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
Dhanya Maliakal
b11b7c1c09 beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable 2015-06-12 17:45:43 +02:00
Dhanya Maliakal
8f4c2001ae warning fixed 2015-04-15 14:49:06 +02:00
Dhanya Maliakal
7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01: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
cdd18182a8 resolved client side memory leak caused from gui 2015-03-04 16:24:03 +01:00
Dhanya Maliakal
2c2d2171d2 get the last frame in eiger with acquiringdone 2015-02-24 16:10:31 +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