Dhanya Maliakal
|
79bce5e006
|
4 bit mode works without gappixels
|
2017-10-26 16:01:18 +02:00 |
|
Dhanya Maliakal
|
9c82a8f726
|
temp in between, trying to get 4 bitmode to work without gap pixels
|
2017-10-26 11:19:58 +02:00 |
|
Dhanya Maliakal
|
7f9ac86862
|
Merge branch 'developer' into gappixels
|
2017-10-23 17:09:13 +02:00 |
|
Dhanya Maliakal
|
d2fd0cbee9
|
x y and z coordinates are pushed into eiger server and its fixed in appropriate client side as well
|
2017-10-23 12:20:18 +02:00 |
|
|
|
4f2af046d3
|
Merge branch 'developer' into gappixels
|
2017-10-12 14:58:41 +02:00 |
|
|
|
311059d748
|
merge fix from 3.0.1 which includes server without crash, multi settimer -1 bug, need to recompile eiger server for this branch
|
2017-10-12 14:42:57 +02:00 |
|
|
|
a59309b13f
|
minor bug fix if same client: client ip only 8 bytes instead of 16 bytes copied, added user class functionality for long term use:stopacquisition
|
2017-10-12 10:18:15 +02:00 |
|
Dhanya Maliakal
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
Dhanya Maliakal
|
03a2f979a9
|
fixing merge conflict in error_Defs
|
2017-10-03 14:32:30 +02:00 |
|
Dhanya Maliakal
|
2aed12dcb9
|
updaterev
|
2017-10-03 14:18:33 +02:00 |
|
Dhanya Maliakal
|
96caf728c8
|
setting receiver to none properly, ten giga set in shared memoery properly if no receiver involved
|
2017-10-03 14:17:48 +02:00 |
|
Dhanya Maliakal
|
bb817733ff
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:05 +02:00 |
|
Dhanya Maliakal
|
352ade6457
|
just skeleton of gappixels
|
2017-09-27 17:08:00 +02:00 |
|
Dhanya Maliakal
|
0a446c425b
|
added users functions for silent mode
|
2017-09-27 10:17:48 +02:00 |
|
Dhanya Maliakal
|
af98d2bb53
|
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
|
2017-09-27 10:09:02 +02:00 |
|
Dhanya Maliakal
|
986826cbe9
|
x y z and id are written to the udp header for eiger
|
2017-09-26 16:39:02 +02:00 |
|
Dhanya Maliakal
|
663fd557ff
|
client gives now 3d positions of detector to be configured in udp header, only in jungfrau firmware till now
|
2017-09-22 15:28:57 +02:00 |
|
Dhanya Maliakal
|
5a8f30fee8
|
Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-09-22 12:28:24 +02:00 |
|
Dhanya Maliakal
|
ab27437604
|
removed setframeindexenable from going to the receiver, it can figure it out on its own now
|
2017-09-22 12:23:39 +02:00 |
|
Dhanya Maliakal
|
7134d0d0ed
|
temp_adc not in eiger for usersclass (esrf). get adc in millicelsius
|
2017-09-21 14:51:32 +02:00 |
|
Dhanya Maliakal
|
6eb5167c70
|
Merge branch '3.0.1' into developer
|
2017-09-21 13:35:16 +02:00 |
|
Dhanya Maliakal
|
5873b5c9a8
|
negligible indentation change
|
2017-09-21 13:34:54 +02:00 |
|
Dhanya Maliakal
|
271664f577
|
changes to users class to call dac and adc by string name
|
2017-09-21 12:54:03 +02:00 |
|
Dhanya Maliakal
|
f2be03be05
|
example for adc index in users
|
2017-09-21 11:51:38 +02:00 |
|
Dhanya Maliakal
|
7e37a1da4b
|
change in user functions
|
2017-09-21 11:16:29 +02:00 |
|
Dhanya Maliakal
|
18f014fd9e
|
added in users class startreceiver, stop receiver, start status
|
2017-09-21 11:05:20 +02:00 |
|
Dhanya Maliakal
|
88b1a5c66a
|
updaterev
|
2017-09-20 19:00:15 +02:00 |
|
Dhanya Maliakal
|
092487c08e
|
Merge branch '3.0.1' into developer
|
2017-09-19 17:19:36 +02:00 |
|
Dhanya Maliakal
|
3a79f0ad9b
|
parallelizing file name has its consequences, file name prefix edited only in multi level
|
2017-09-19 11:37:54 +02:00 |
|
Dhanya Maliakal
|
15b86a50d5
|
added advanced user stuff for esrf
|
2017-09-19 10:05:55 +02:00 |
|
Dhanya Maliakal
|
90f899c936
|
replaced post incrementing by pre incrementing
|
2017-09-18 17:20:38 +02:00 |
|
Dhanya Maliakal
|
a95e2efdb0
|
parallelized settimer, setfileindex, setonline, setreceiveronline, getreceiverstatus, resetframescaught, setFrameIndex, setFileName, getFramesCaughtByReceiver; added getFramesCaughtbyAnyreceiver to avoid threadpool and to use in post processing
|
2017-09-18 16:47:22 +02:00 |
|
Dhanya Maliakal
|
e6125c3c7f
|
base fix for parallelism made more efficient
|
2017-09-15 09:20:43 +02:00 |
|
Dhanya Maliakal
|
c635b19941
|
fixed jungfrau image after programfpga, fixed resetfpga
|
2017-09-14 15:55:55 +02:00 |
|
Dhanya Maliakal
|
49378e6d09
|
added streamsrcip command to be able to change the interface from which receiver streams data from
|
2017-09-12 14:33:11 +02:00 |
|
Dhanya Maliakal
|
aef462da32
|
merge error fixed
|
2017-09-08 09:31:26 +02:00 |
|
|
|
1ba325e902
|
Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer
|
2017-09-07 11:27:52 +02:00 |
|
Dhanya Maliakal
|
91fece87b2
|
updaterev
|
2017-08-28 12:05:42 +02:00 |
|
Dhanya Maliakal
|
a8b41ca813
|
updating user documentation
|
2017-08-25 15:46:16 +02:00 |
|
Dhanya Maliakal
|
5e11e0a7db
|
added adc reader standalone
|
2017-08-24 18:40:52 +02:00 |
|
Dhanya Maliakal
|
e5c84fd11c
|
external gui unused variables
|
2017-08-24 16:03:31 +02:00 |
|
Dhanya Maliakal
|
0bea688a83
|
changes for external gui
|
2017-08-23 19:06:40 +02:00 |
|
Dhanya Maliakal
|
bdccddfe97
|
in between
|
2017-08-23 18:24:48 +02:00 |
|
Dhanya Maliakal
|
a236a7a9aa
|
Merge branch '3.0' into externalgui
|
2017-08-23 18:01:58 +02:00 |
|
Dhanya Maliakal
|
7ffd9b87b8
|
bug fix:removed 0x prefix for dr
|
2017-08-23 18:01:34 +02:00 |
|
Dhanya Maliakal
|
a657bac1b1
|
removed a print
|
2017-08-23 18:01:02 +02:00 |
|
Dhanya Maliakal
|
f4e2b819d2
|
changes for external gui
|
2017-08-23 16:31:32 +02:00 |
|
Dhanya Maliakal
|
4f28df03ab
|
trials
|
2017-08-22 19:43:26 +02:00 |
|
Dhanya Maliakal
|
4e374eb2cd
|
updaterev
|
2017-08-18 18:35:30 +02:00 |
|
Dhanya Maliakal
|
cda7814c21
|
timing put for delay and period
|
2017-08-17 17:23:13 +02:00 |
|
