Dhanya Maliakal
|
51499fa503
|
merge conflict from 3.0.1
|
2017-11-17 11:35:02 +01:00 |
|
Dhanya Maliakal
|
f647bdaa48
|
updated users class to reflect zmq changes (separation), fixed warnings
|
2017-11-17 08:46:43 +01:00 |
|
Dhanya Maliakal
|
4097c37b31
|
in between
|
2017-11-16 16:01:31 +01:00 |
|
Dhanya Maliakal
|
8e0414d1b9
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:01:22 +01:00 |
|
Dhanya Maliakal
|
7dee07b9c5
|
somewhere
|
2017-11-16 09:12:54 +01:00 |
|
Dhanya Maliakal
|
2b0d07387a
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:47 +01:00 |
|
Dhanya Maliakal
|
dda86cfe9b
|
somewhere in separating zmq rxr and client
|
2017-11-14 16:26:17 +01:00 |
|
Dhanya Maliakal
|
6693d08331
|
fixed help of acquire doing an actual acquisition
|
2017-11-14 11:53:37 +01:00 |
|
Dhanya Maliakal
|
cf4498cf78
|
Merge branch '3.0.1' into developer
|
2017-11-14 10:59:01 +01:00 |
|
Dhanya Maliakal
|
4903164f95
|
added high voltage to users class
|
2017-11-14 10:58:54 +01:00 |
|
Dhanya Maliakal
|
c127eebeaa
|
Merge branch '3.0.1' into developer
|
2017-11-14 09:13:39 +01:00 |
|
Dhanya Maliakal
|
ef257d12e7
|
prev bug fix of ratecorr for eiger from users, made simpler
|
2017-11-14 09:13:32 +01:00 |
|
Dhanya Maliakal
|
363aa9124e
|
Merge branch '3.0.1' into developer
|
2017-11-14 09:08:16 +01:00 |
|
Dhanya Maliakal
|
7e0af1cc7c
|
bugfix: users rate correction able to set for eiger
|
2017-11-14 09:08:08 +01:00 |
|
Dhanya Maliakal
|
1af065fdb1
|
infinite loop with gettotalnumberofchannels in gappixels initialization resulting in bus error fix
|
2017-11-13 11:13:26 +01:00 |
|
Dhanya Maliakal
|
678ef89e17
|
conflict resolved from merge developer to gappixels insignificant
|
2017-11-10 16:54:18 +01:00 |
|
Dhanya Maliakal
|
3886a0c9ad
|
merge fix from 3.0.1 regarding gethostbyname thread safety
|
2017-11-10 16:37:20 +01:00 |
|
Dhanya Maliakal
|
23ddb3d4b5
|
merge fix from 3.0.1 regarding gethostbyname thread safety
|
2017-11-10 16:34:31 +01:00 |
|
Dhanya Maliakal
|
739187943d
|
replaced gethostbyname with getaddrinfo as it is not thread safe
|
2017-11-10 16:30:38 +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
|
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 |
|
