Dhanya Maliakal
|
fb0afc282d
|
gotthard server, too fast now sets stopped bit high and stops acquisition, so polling status also made aware of stopped bit
|
2017-11-09 14:01:36 +01:00 |
|
Dhanya Maliakal
|
d24ab31d87
|
gotthard fix
|
2017-11-09 13:44:38 +01:00 |
|
Dhanya Maliakal
|
3c6d572369
|
including dynamic range in gui call back
|
2017-11-02 11:02:40 +01:00 |
|
Dhanya Maliakal
|
82f503aa09
|
dynamic range also updates offsets, 4 bit mode gap pixels work in call back from gui
|
2017-10-31 12:50:31 +01:00 |
|
Dhanya Maliakal
|
6ff249c3f2
|
Merge branch 'developer' into gappixels
|
2017-10-27 16:18:52 +02:00 |
|
Dhanya Maliakal
|
b75dde4613
|
merge bug fix of set module
|
2017-10-27 16:17:12 +02:00 |
|
Dhanya Maliakal
|
f6989d5539
|
merge bug fix of set module
|
2017-10-27 16:16:38 +02:00 |
|
Dhanya Maliakal
|
7ff23b25b3
|
merge bug fix of set module
|
2017-10-27 16:16:29 +02:00 |
|
Dhanya Maliakal
|
1420921291
|
Merge branch '3.0' into 3.0.1
|
2017-10-27 15:47:15 +02:00 |
|
Dhanya Maliakal
|
045a7cfcb1
|
removed settings bug, highvoltage returning 60 when switched off
|
2017-10-27 15:38:07 +02:00 |
|
Dhanya Maliakal
|
92f988ddc1
|
somewhere
|
2017-10-27 14:00:57 +02:00 |
|
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 |
|
|
|
36a200ceba
|
Merge branch 'developer' into gappixels
|
2017-10-12 15:09:30 +02:00 |
|
|
|
ae72df7b14
|
.project added to gitignore
|
2017-10-12 15:07:54 +02:00 |
|
|
|
4f2af046d3
|
Merge branch 'developer' into gappixels
|
2017-10-12 14:58:41 +02:00 |
|
Dhanya Maliakal
|
d2767afa7c
|
added the eiger server binary with merges from 3.0.1
|
2017-10-12 14:57:12 +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 |
|
Dhanya Maliakal
|
fe6e1c8868
|
new eiger server binary with status fixed
|
2017-10-12 11:48:43 +02:00 |
|
Dhanya Maliakal
|
eb78ae0fe1
|
new eiger server binary with status fixed
|
2017-10-12 11:44:46 +02:00 |
|
|
|
8585a536ec
|
fixed eiger server status problem, updating binary in next commit
|
2017-10-12 11:42:37 +02:00 |
|
|
|
338fb2af35
|
in betwee, fixed eiger server error
|
2017-10-12 11:38:26 +02:00 |
|
|
|
a6e520d969
|
in between stage: error in compiling eiger server with error status: include file
|
2017-10-12 11:35:31 +02:00 |
|
|
|
eb32335194
|
trying changes to server for error
|
2017-10-12 10:51:47 +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 |
|
|
|
f2f061ae18
|
bug fix: using int instead of int64_t , eg exptime is -1 on return
|
2017-10-12 09:47:13 +02:00 |
|
Dhanya Maliakal
|
44bf4c52ed
|
changes for eiger server to return error if error
|
2017-10-06 13:48:06 +02:00 |
|
Dhanya Maliakal
|
4260dc0baf
|
conflict resolution
|
2017-10-03 15:18:56 +02:00 |
|
Dhanya Maliakal
|
0f302e3446
|
conflict resolution
|
2017-10-03 15:17:15 +02:00 |
|
Dhanya Maliakal
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
Dhanya Maliakal
|
34f10b382e
|
one more conflict resolved from mergin with 3.0.1 (silent mode, this had changes for zmq source ip)
|
2017-10-03 15:01:30 +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
|
afc08f8c30
|
double* changed to char* in gui data call back, decoding to be done by caller. enablegappixels skeleton created
|
2017-10-02 13:21:38 +02:00 |
|
Dhanya Maliakal
|
1a8b0692fe
|
works but needs to be verified. the void* in call back
|
2017-09-29 11:39:10 +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
|
c2f6e5b20c
|
modifying to adjust to common basic tests debug mode for jungfrau
|
2017-09-21 17:58:10 +02:00 |
|
Dhanya Maliakal
|
7e0481eeff
|
renamed server names
|
2017-09-21 16:45:40 +02:00 |
|
Dhanya Maliakal
|
2b3d2bb4d7
|
removed changing number of samples by setting dynamic range
|
2017-09-21 16:36:33 +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 |
|
