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 |
|
Dhanya Maliakal
|
c2980b3c44
|
changes for setting threshold without trimbits for eiger
|
2017-06-28 10:24:07 +02:00 |
|
Dhanya Maliakal
|
1ed4407c11
|
parallelizing adcs and dacs
|
2017-06-23 17:26:46 +02:00 |
|
Dhanya Maliakal
|
57ae305c7d
|
parallelized enabledatastreaming
|
2017-06-22 16:59:41 +02:00 |
|
Dhanya Maliakal
|
bbbd4731d7
|
ensuring acquire, p receiver start and the gui enables and disables data streaming accordingly. those with api will have to know what they want before acquiring
|
2017-06-22 16:44:29 +02:00 |
|
Dhanya Maliakal
|
fe73e09aa4
|
removing unnecessary printouts, ensuring lost packets are 0xff
|
2017-06-21 17:05:47 +02:00 |
|
Dhanya Maliakal
|
48f853aa1a
|
fixed gui getting stuck (wrong datathreadmask more than 64 bits cuz of 72 sockets)
|
2017-06-20 12:38:59 +02:00 |
|
Dhanya Maliakal
|
e2e25f6e62
|
changed API for setting network parameter to remove memory leak, fixed lock issues in streaming print outs to gui, deleted return from threadpool in the right place
|
2017-06-19 14:29:45 +02:00 |
|
Dhanya Maliakal
|
15424149cd
|
removed leak from postprocessing, moved delete task to earlier in threadpool and deleting threadpool
|
2017-05-12 10:32:16 +02:00 |
|
Dhanya Maliakal
|
0722ef3125
|
changes including warnings and zmq
|
2017-05-04 17:52:47 +02:00 |
|
Dhanya Maliakal
|
066550d38c
|
zmq changes for no dummy data end
|
2017-05-01 14:02:13 +02:00 |
|
Dhanya Maliakal
|
445da80df8
|
resolved warnings, also from esrf: todo: include changes in zmq
|
2017-05-01 13:11:10 +02:00 |
|
Dhanya Maliakal
|
536f8937cb
|
merging
|
2017-03-24 09:10:09 +01:00 |
|
Dhanya Maliakal
|
c47f2f3449
|
solved the gui 4 bit bug where no data was displayed: due to byterperchannel being int and a 0
|
2017-03-23 13:31:22 +01:00 |
|
Dhanya Maliakal
|
aae4e3f993
|
removed unnessary printout
|
2017-03-20 11:22:35 +01:00 |
|
Dhanya Maliakal
|
911ff49238
|
changes for merges from 2.3 incl standard packet header
|
2017-03-20 11:22:07 +01:00 |
|
Dhanya Maliakal
|
4b388f56b2
|
fixed gui for new header
|
2017-03-20 09:27:38 +01:00 |
|
Dhanya Maliakal
|
7e00d9f395
|
Merge branch 'developer' into hdf5
|
2017-03-03 10:06:34 +01:00 |
|
Dhanya Maliakal
|
fa6d18e9b2
|
moving subframenumber into a 32 bit number
|
2017-02-28 15:29:53 +01:00 |
|
Dhanya Maliakal
|
2024eb5d6e
|
gui works
|
2017-02-28 13:14:18 +01:00 |
|
Dhanya Maliakal
|
19460a03f5
|
sending position id and num detectors in x and y dir
|
2017-02-21 15:13:27 +01:00 |
|
Dhanya Maliakal
|
9b3f4a3a66
|
commonFiles/error_defs.h
|
2017-02-03 14:34:05 +01:00 |
|
Dhanya Maliakal
|
87ce1ed736
|
moved tau to settings file, removed gain and offset, setting threshold loads settings file, setting threshold only sets client variable
|
2017-02-03 12:29:44 +01:00 |
|
|
|
987aeda6fb
|
sorted out problem with CPU read out
|
2016-12-22 17:24:53 +01:00 |
|
|
|
3eea80a121
|
compiles after merging
|
2016-12-19 13:50:25 +01:00 |
|
