|
|
e6f1a90ed7
|
changes
|
2017-06-27 14:57:43 +02:00 |
|
|
|
0b6aeac364
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-06-27 10:40:19 +02:00 |
|
|
|
5dd2f273fc
|
eigerserver changes, need to include martins changes
|
2017-06-27 10:22:55 +02:00 |
|
|
|
ffd3cb6511
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-06-26 13:03:08 +02:00 |
|
|
|
dfb8a1f7ad
|
small modifications for jctb and moench03 module
|
2017-06-26 13:03:01 +02:00 |
|
|
|
1ed4407c11
|
parallelizing adcs and dacs
|
2017-06-23 17:26:46 +02:00 |
|
|
|
f7e4dbc99e
|
getadc must specify -1 for imod, as imod in multi might be default 0
|
2017-06-23 17:26:33 +02:00 |
|
|
|
57ae305c7d
|
parallelized enabledatastreaming
|
2017-06-22 16:59:41 +02:00 |
|
|
|
5d75d8371b
|
unnecessary printout
|
2017-06-22 16:59:18 +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 |
|
|
|
df01ca7e4b
|
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:13 +02:00 |
|
|
|
931e750d65
|
fixed gui starting up without the config file
|
2017-06-22 15:26:00 +02:00 |
|
|
|
697fc5b85e
|
updaterev
|
2017-06-22 14:36:22 +02:00 |
|
|
|
cd86c708dc
|
updaterev
|
2017-06-22 14:36:02 +02:00 |
|
|
|
cffdf7fede
|
updaterev
|
2017-06-22 14:33:24 +02:00 |
|
|
|
c05b89a77d
|
updating exe
|
2017-06-22 14:32:52 +02:00 |
|
|
|
f66950d312
|
fixed the 9m master server having to be rebooted for hv to work
|
2017-06-22 14:32:24 +02:00 |
|
|
|
98cb8de478
|
when using userReceiver with many instances of the receiver in one program, the index will keep increasing, hence need to adjust zmq port and det index in file name
|
2017-06-22 12:27:17 +02:00 |
|
|
|
1dc774d229
|
comments
|
2017-06-21 17:08:47 +02:00 |
|
|
|
1c7ff1dd8c
|
adding printouts , resetting an image size for each listen image, if last image is not complete, it should be checked with rc==0 and not if itis transmitting, else it doesnt send last incomplete image
|
2017-06-21 17:07:45 +02:00 |
|
|
|
fe73e09aa4
|
removing unnecessary printouts, ensuring lost packets are 0xff
|
2017-06-21 17:05:47 +02:00 |
|
|
|
b2caec384f
|
removing receiver print config from gui
|
2017-06-21 17:03:41 +02:00 |
|
|
|
1c221d5844
|
insignificant uncommented gui in makefile
|
2017-06-20 12:47:25 +02:00 |
|
|
|
8b3864969c
|
updated server exe
|
2017-06-20 12:45:13 +02:00 |
|
|
|
cbd1570a8c
|
fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets), gotthard detector receiver updated
|
2017-06-20 12:43:28 +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 |
|
|
|
68bbea17d1
|
removed fifo buffer size print out (fifo buffer size removed earlier)
|
2017-06-19 14:20:17 +02:00 |
|
|
|
2ec1e08081
|
changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui
|
2017-06-19 14:19:30 +02:00 |
|
|
|
3007694b77
|
bug (from eiger_newheader) with imagesize of fifo different from actual image size
|
2017-06-16 13:53:27 +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 |
|
|
|
8d6ceccf87
|
updaterev
|
2017-06-14 11:38:28 +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 |
|
|
|
1537bb3298
|
more detail in printf
|
2017-06-13 12:59:26 +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 |
|
|
|
7f01ccc83f
|
updaterev
|
2017-06-12 18:53:42 +02:00 |
|
|
|
e1eba8dec3
|
new servers
|
2017-06-12 18:53:18 +02:00 |
|
|
|
3fbbeea434
|
update rev
|
2017-06-12 18:51:52 +02:00 |
|
|
|
47e5504203
|
updaterev
|
2017-06-12 18:50:55 +02:00 |
|
|
|
d41abc2b1c
|
added new jungfraustructure, wiht common detector tcp interface
|
2017-06-12 18:50:18 +02:00 |
|
