Commit Graph

1441 Commits

Author SHA1 Message Date
374b07a126 merge developer 2017-07-03 17:42:06 +02:00
f944d7cae4 made updatereceiver to actually update client in parameters that it can 2017-07-03 17:37:24 +02:00
b4309a9f60 changed jungfrau temperature conversion but binary to follow 2017-07-03 14:45:44 +02:00
99dad79572 Somewhere 2017-07-03 13:46:06 +02:00
da4ffb235c ensuring set detector type is the first call 2017-07-03 13:32:10 +02:00
b05e9c194a makefiles and versioning update complete 2017-06-29 17:10:10 +02:00
1a74ceca3e ensuring file permissions 2017-06-28 18:16:55 +02:00
7990dd6f77 fixed makefile and included correct versioning while compiling 2017-06-28 18:13:47 +02:00
8992d51787 correct binary jungfrau 2017-06-28 11:26:35 +02:00
4905f49108 added updateversion into makefile while compiling 2017-06-28 11:23:19 +02:00
fde7ddf832 added updateversion into makefile while compiling 2017-06-28 11:00:21 +02:00
7a8d0b8dad added updateversion into makefile while compiling 2017-06-28 10:57:39 +02:00
56645a48af added updateversion into makefile while compiling 2017-06-28 10:54:27 +02:00
a7d3006cda added updateversion into makefile while compiling 2017-06-28 10:48:03 +02:00
c2624daa9a uncommented a print 2017-06-28 10:27:40 +02:00
2126e2a723 added updategit 2017-06-28 10:24:49 +02:00
c2980b3c44 changes for setting threshold without trimbits for eiger 2017-06-28 10:24:07 +02:00
ca358e4d17 changes to the eiger and jungfrau server regarding getnumberofchans etc a typo bug resulting in could not allocate 2017-06-27 17:46:32 +02:00
5dd2f273fc eigerserver changes, need to include martins changes 2017-06-27 10:22:55 +02:00
1ed4407c11 parallelizing adcs and dacs 2017-06-23 17:26:46 +02:00
57ae305c7d parallelized enabledatastreaming 2017-06-22 16:59:41 +02:00
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
cd86c708dc updaterev 2017-06-22 14:36:02 +02:00
f66950d312 fixed the 9m master server having to be rebooted for hv to work 2017-06-22 14:32:24 +02:00
fe73e09aa4 removing unnecessary printouts, ensuring lost packets are 0xff 2017-06-21 17:05:47 +02:00
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
48f853aa1a fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets) 2017-06-20 12:38:59 +02:00
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
c2af014dad new server 2017-06-14 12:07:58 +02:00
a46a8cc686 updaterev 2017-06-14 11:41:11 +02:00
9ab2c1eb1f new server 2017-06-14 11:40:35 +02:00
84d07a3e0c updaterev 2017-06-14 11:39:07 +02:00
5176ad521f merged with annas, removed a <<< head merge conflict 2017-06-14 11:36:44 +02:00
feb1ef4ea5 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer 2017-06-14 11:28:24 +02:00
00e742e0e0 took out also the ADC and serialspi 2017-06-14 11:28:16 +02:00
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
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
3d8903b2da updaterev 2017-06-12 18:54:58 +02:00
e1eba8dec3 new servers 2017-06-12 18:53:18 +02:00
3fbbeea434 update rev 2017-06-12 18:51:52 +02:00
d41abc2b1c added new jungfraustructure, wiht common detector tcp interface 2017-06-12 18:50:18 +02:00
b46da37932 new server for change in cleanup of servers 2017-06-12 18:39:06 +02:00
74ca3fcc9a jungfrau server works 2017-06-12 18:27:59 +02:00
132a9bbfe9 solved many bugs, but cannot get data in eiger 2017-06-09 16:02:58 +02:00
c755a8974c done, but need to compile 2017-06-09 11:42:25 +02:00
0254ff0281 cleaning up of servers 2017-06-02 19:29:34 +02:00
2465eafff0 somewhere in between 2017-05-30 19:00:11 +02:00
f74710998d mannnnyyyy changes to jungfrau serverin structure, also to eiger structure a bit 2017-05-26 18:14:44 +02:00