Dhanya Maliakal
|
0d92b11055
|
print out comment, not print if mythen else access to null
|
2017-10-05 15:58:37 +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
|
e54767b69d
|
conflict resolution with developer
|
2017-10-03 15:12:56 +02:00 |
|
Dhanya Maliakal
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
Dhanya Maliakal
|
fc025bd28b
|
conflict resolution with developer
|
2017-10-03 15:12:35 +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
|
0b82aabd2b
|
merge with 3.0.1 conflicts resolved
|
2017-10-03 14:52:53 +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
|
4669d408d4
|
somewhere in between
|
2017-10-03 12:09:31 +02:00 |
|
Dhanya Maliakal
|
c594870fdd
|
Merge branch 'realgappixels' into gappixels
|
2017-10-03 10:49:47 +02:00 |
|
Dhanya Maliakal
|
34062b6e0b
|
fixed 32 bit gui masking problem in qdrawplot (conversion from char* to double) mythen clause not activated
|
2017-10-03 10:49:26 +02:00 |
|
Dhanya Maliakal
|
7cde5dbe38
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:08 +02:00 |
|
Dhanya Maliakal
|
bb817733ff
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:05 +02:00 |
|
Dhanya Maliakal
|
7cf7d9eb79
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:01 +02:00 |
|
Dhanya Maliakal
|
907ab2f0bd
|
changes upto the receiver, not incl gui
|
2017-10-03 10:43:47 +02:00 |
|
Dhanya Maliakal
|
d0b379a2d5
|
double* changed to char* in gui data call back, effect in receiver is change in zmqsocket.h from int* to char*
|
2017-10-02 13:21:49 +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
|
5a7800768b
|
double* to char* in detector call back.
|
2017-10-02 13:20:19 +02:00 |
|
Dhanya Maliakal
|
63c0fe863d
|
missing packets 0xffff are also anded with the mask, fixed
|
2017-09-29 18:33:41 +02:00 |
|
Dhanya Maliakal
|
fa79a36089
|
should work, but jungfrau needs debugging
|
2017-09-29 16:43:07 +02:00 |
|
Dhanya Maliakal
|
9bdb361d08
|
works but needs to be verified. the void* in call back
|
2017-09-29 11:39:36 +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
|
e51d178eaa
|
added silent mode functionality and modified users class for it, updated manuals
|
2017-09-27 10:18:20 +02:00 |
|
Dhanya Maliakal
|
0a446c425b
|
added users functions for silent mode
|
2017-09-27 10:17:48 +02:00 |
|
Dhanya Maliakal
|
6a8aad4c2b
|
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
|
2017-09-27 10:11:31 +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
|
e0d82ad92d
|
only 3d positins in x y z coord, so receiver not overwriting them
|
2017-09-22 15:29:28 +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
|
e8bb186ff8
|
removed setframeindexenable from being set by client, redundant. removed read_frame from list of functions, obsolete.
|
2017-09-22 12:25:08 +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 |
|
l_msdetect
|
1c3b9c603c
|
manual
|
2017-09-21 20:26:35 +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 |
|
|
|
d8803ca5e4
|
improved library structure for analog detectors and interpolation t.b.t.
|
2017-09-21 15:03:43 +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
|
2bd5386c29
|
Merge branch '3.0.1' into developer
|
2017-09-21 13:35:16 +02:00 |
|
Dhanya Maliakal
|
c5ff578d10
|
Merge branch '3.0.1' into developer
|
2017-09-21 13:35:16 +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 |
|
