Dhanya Maliakal
|
c5c23e73d5
|
works zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:39:04 +01:00 |
|
Dhanya Maliakal
|
428855d801
|
in between
|
2017-11-17 14:02:00 +01:00 |
|
Dhanya Maliakal
|
51499fa503
|
merge conflict from 3.0.1
|
2017-11-17 11:35:02 +01:00 |
|
Dhanya Maliakal
|
7dee07b9c5
|
somewhere
|
2017-11-16 09:12:54 +01:00 |
|
Dhanya Maliakal
|
fd34bab34b
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:19:07 +01:00 |
|
Dhanya Maliakal
|
dda86cfe9b
|
somewhere in separating zmq rxr and client
|
2017-11-14 16:26:17 +01:00 |
|
Dhanya Maliakal
|
4c4a26c0e3
|
Merge branch '3.0.1' into developer
|
2017-11-13 13:39:39 +01:00 |
|
Dhanya Maliakal
|
70848c9891
|
bugfix ratecorr always gave back -100
|
2017-11-13 13:39:28 +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
|
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
|
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 |
|
|
|
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 |
|
|
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
5b0fd60775
|
parallelized ratecorrection
|
2017-09-18 17:49:08 +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
|
54d231d3c6
|
parallelized set timer, file index
|
2017-09-15 14:51:43 +02:00 |
|
Dhanya Maliakal
|
67cdfe8b41
|
in between
|
2017-09-14 16:58:39 +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
|
272167435d
|
gainplot added, masking done separately before converting to double
|
2017-09-01 12:04:04 +02:00 |
|
Dhanya Maliakal
|
0bea688a83
|
changes for external gui
|
2017-08-23 19:06:40 +02:00 |
|
Dhanya Maliakal
|
19d973f5d6
|
Merge branch '3.0' into externalgui
|
2017-08-23 18:26:46 +02:00 |
|
Dhanya Maliakal
|
6332025bbc
|
frames caught in 9m was only looking at 1st receiver, now made to average
|
2017-08-23 18:26:25 +02:00 |
|
Dhanya Maliakal
|
bdccddfe97
|
in between
|
2017-08-23 18:24:48 +02:00 |
|
Dhanya Maliakal
|
4f28df03ab
|
trials
|
2017-08-22 19:43:26 +02:00 |
|
|
|
3aeb15648c
|
Anna's modifications
|
2017-08-11 15:55:07 +02:00 |
|
|
|
52e1bd32b9
|
Anna's modifications
|
2017-08-11 15:52:08 +02:00 |
|
Dhanya Maliakal
|
e8d83a085f
|
moved receiver start to status start and to startandreadall (acquire), parallelized status start, moved prepare and clean up to multi level and called by start and stop receiver for gotthard, moench and propix
|
2017-08-10 18:46:10 +02:00 |
|
Dhanya Maliakal
|
389f356a3a
|
high voltage reflects the master only, if 2 masters reflects -1
|
2017-08-10 11:09:44 +02:00 |
|
Dhanya Maliakal
|
558e5e2e9a
|
added busy command, converted get frames etc to an integer output
|
2017-08-08 19:15:20 +02:00 |
|
Dhanya Maliakal
|
e3667f6827
|
can set zmqport from receiver
|
2017-07-13 12:18:07 +02:00 |
|
Dhanya Maliakal
|
931a5840e8
|
changes to gotthard server to include write adc, and also changes to fix the dma=dma+1
|
2017-07-11 10:54:21 +02:00 |
|
Dhanya Maliakal
|
f944d7cae4
|
made updatereceiver to actually update client in parameters that it can
|
2017-07-03 17:37:24 +02:00 |
|
