1423 Commits

Author SHA1 Message Date
Dhanya Maliakal
5dd2f273fc eigerserver changes, need to include martins changes 2017-06-27 10:22:55 +02:00
Dhanya Maliakal
1ed4407c11 parallelizing adcs and dacs 2017-06-23 17:26:46 +02:00
Dhanya Maliakal
57ae305c7d parallelized enabledatastreaming 2017-06-22 16:59:41 +02:00
Dhanya Maliakal
bbbd4731d7 ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring 2017-06-22 16:44:29 +02:00
Dhanya Maliakal
cd86c708dc updaterev 2017-06-22 14:36:02 +02:00
Dhanya Maliakal
f66950d312 fixed the 9m master server having to be rebooted for hv to work 2017-06-22 14:32:24 +02:00
Dhanya Maliakal
fe73e09aa4 removing unnecessary printouts, ensuring lost packets are 0xff 2017-06-21 17:05:47 +02:00
Dhanya Maliakal
df71899244 fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets), gotthard detector server udpated 2017-06-20 12:40:28 +02:00
Dhanya Maliakal
48f853aa1a fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets) 2017-06-20 12:38:59 +02:00
Dhanya Maliakal
e2e25f6e62 changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place 2017-06-19 14:29:45 +02:00
Dhanya Maliakal
c2af014dad new server 2017-06-14 12:07:58 +02:00
Dhanya Maliakal
a46a8cc686 updaterev 2017-06-14 11:41:11 +02:00
Dhanya Maliakal
9ab2c1eb1f new server 2017-06-14 11:40:35 +02:00
Dhanya Maliakal
84d07a3e0c updaterev 2017-06-14 11:39:07 +02:00
Dhanya Maliakal
5176ad521f merged with annas, removed a <<< head merge conflict 2017-06-14 11:36:44 +02:00
Dhanya Maliakal
feb1ef4ea5 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-06-14 11:28:24 +02:00
Dhanya Maliakal
00e742e0e0 took out also the ADC and serialspi 2017-06-14 11:28:16 +02:00
Dhanya Maliakal
a95dbd2215 made some functions common 2017-06-14 10:43:15 +02:00
cbbdd8eeab Merged to developer 2017-06-13 15:30:33 +02:00
8caab4e562 Modicfications for chiptestboard and moench03 module 2017-06-13 15:28:45 +02:00
Dhanya Maliakal
cb7b8713cf fixed the precision problem in converting double to long long int (0.0000325 *1E9), cant find another example 2017-06-13 12:58:56 +02:00
Dhanya Maliakal
3d8903b2da updaterev 2017-06-12 18:54:58 +02:00
Dhanya Maliakal
e1eba8dec3 new servers 2017-06-12 18:53:18 +02:00
Dhanya Maliakal
3fbbeea434 update rev 2017-06-12 18:51:52 +02:00
Dhanya Maliakal
d41abc2b1c added new jungfraustructure, wiht common detector tcp interface 2017-06-12 18:50:18 +02:00
Dhanya Maliakal
b46da37932 new server for change in cleanup of servers 2017-06-12 18:39:06 +02:00
Dhanya Maliakal
74ca3fcc9a jungfrau server works 2017-06-12 18:27:59 +02:00
Dhanya Maliakal
132a9bbfe9 solved many bugs, but cannot get data in eiger 2017-06-09 16:02:58 +02:00
Dhanya Maliakal
c755a8974c done, but need to compile 2017-06-09 11:42:25 +02:00
Dhanya Maliakal
0254ff0281 cleaning up of servers 2017-06-02 19:29:34 +02:00
Dhanya Maliakal
2465eafff0 somewhere in between 2017-05-30 19:00:11 +02:00
Dhanya Maliakal
f74710998d mannnnyyyy changes to jungfrau serverin structure, also to eiger structure a bit 2017-05-26 18:14:44 +02:00
Dhanya Maliakal
046ac97a9b now need to move it to a new server 2017-05-24 17:42:33 +02:00
Dhanya Maliakal
b8f0dd5f38 cleaned most of it, just need confirmation from carlos 2017-05-24 17:33:03 +02:00
Dhanya Maliakal
0ea61a1e3f somewhere 2017-05-24 11:05:37 +02:00
Dhanya Maliakal
978af1009e somewhere in between cleaning up 2017-05-22 14:53:15 +02:00
Dhanya Maliakal
39a985cbba modifying registers_m.h wrt Carlos firmware document, modified detector initialization in firmware_funcs.c and related files 2017-05-19 18:27:11 +02:00
Dhanya Maliakal
15424149cd removed leak from postprocessing, moved delete task to earlier in threadpool and deleting threadpool 2017-05-12 10:32:16 +02:00
0e9cf558b4 Modified JUNGFRAU_MODULE_ID to match the detector type definition that is tx. with the new header. 2017-05-10 16:47:10 +02:00
Dhanya Maliakal
0722ef3125 changes including warnings and zmq 2017-05-04 17:52:47 +02:00
Dhanya Maliakal
066550d38c zmq changes for no dummy data end 2017-05-01 14:02:13 +02:00
Dhanya Maliakal
020eaded36 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-05-01 13:11:16 +02:00
Dhanya Maliakal
445da80df8 resolved warnings, also from esrf: todo: include changes in zmq 2017-05-01 13:11:10 +02:00
f937b8ca5d Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-05-01 12:21:07 +02:00
l_lopez
7901b6f463 Modified "calcChecksum" function in jungfrauDetectorServer/firmware_funcs.c to compute properly the new IP header checksum for a new application header of 48 bytes. 2017-05-01 12:14:06 +02:00
Dhanya Maliakal
e9f6dcf479 strtok is not thread safe..used to set receiver udp ip etc to detector, fixed 2017-05-01 10:24:16 +02:00
Dhanya Maliakal
264485c8ff changed all -lpthread to -pthread 2017-05-01 09:53:37 +02:00
Dhanya Maliakal
bc57ea5725 added the binary 2017-04-28 11:31:12 +02:00
Dhanya Maliakal
27f752ff9e removed wrong edits in merging (not reflected in git browser, weird); changing server names anyway 2017-04-28 11:30:09 +02:00
Dhanya Maliakal
536f8937cb merging 2017-03-24 09:10:09 +01:00