Commit Graph

84 Commits

Author SHA1 Message Date
c366e94a96 bit field for missing packets, added commands r_padding and r_discardpolicy, hdf5 bitfield metadata left to do 2018-07-05 13:47:20 +02:00
cf8b0de433 slsReceiver, slsDetector, eiger and jungfrau server: client checks firmware and software an dreceiver compatibility for each time shared memory is cleaned up 2018-05-28 19:11:34 +02:00
212218396a removal of using namespace std from theadFiles 2018-05-24 14:47:45 +02:00
621b7cfb2a adding std:: where needed 2018-05-24 14:11:30 +02:00
d3a0319863 esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails 2018-05-02 16:49:27 +02:00
bc70cc3a26 jungfrau server: added storage start, connected auto_comp_disable, changed adcphase, added ADC_PORT_INVERT_VAL, ADC_OFST_HALF_SPEED_VAL, minimum exposure time 2018-04-13 17:33:46 +02:00
5340b8ef24 added error mask for loading/writing config file to be caught by python 2018-03-26 18:07:10 +02:00
3da6a6df65 merge conflict removed, jungfrau server and eiger server re compiled 2018-02-05 12:33:05 +01:00
5d04067973 added auto comp disable feature 2018-02-02 18:01:01 +01:00
2d6e4c95a2 temp_threshold, temp_control, temp_event done 2018-01-11 15:37:24 +01:00
12348ac76c merge conflict fix 2017-12-01 09:20:44 +01:00
18422ce215 setbit and clear bit moved to slsdet, readreg, writereg,setbit,clearbit in multi cannot give -1, instead api gives error if checked 2017-12-01 09:18:42 +01:00
5b88203bd9 merge conflict from 3.0.1 to restream stop from recieveR 2017-11-30 19:05:35 +01:00
ca855e6d39 restream stop from receiver 2017-11-30 18:37:11 +01:00
51499fa503 merge conflict from 3.0.1 2017-11-17 11:35:02 +01:00
7dee07b9c5 somewhere 2017-11-16 09:12:54 +01:00
4260dc0baf conflict resolution 2017-10-03 15:18:56 +02:00
0f302e3446 conflict resolution 2017-10-03 15:17:15 +02:00
812606a7b4 conflict resolution with developer 2017-10-03 15:12:49 +02:00
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
03a2f979a9 fixing merge conflict in error_Defs 2017-10-03 14:32:30 +02:00
bb817733ff changes upto the receiver, not incl gui 2017-10-03 10:44:05 +02:00
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
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
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
f084efd263 sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa 2017-08-10 17:25:18 +02:00
19460a03f5 sending position id and num detectors in x and y dir 2017-02-21 15:13:27 +01:00
9b3f4a3a66 commonFiles/error_defs.h 2017-02-03 14:34:05 +01:00
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
ebf44704b2 merged error defs 2016-12-19 11:39:14 +01:00
bd1601c2eb fixwed the printing of errors but not error message 2016-12-19 11:37:14 +01:00
d555bc6e75 fixwed the printing of errors but not error message 2016-12-19 11:33:16 +01:00
e7621a6cd0 moving towards c++ api 2016-12-12 14:24:11 +01:00
466f1506a5 bottom is defined as flippeddatax in config file, not anymore as argument for receiver 2016-11-30 10:36:34 +01:00
c639477f28 adding exptime to receiver for file header 2016-11-14 11:57:29 +01:00
44d6b0ffc0 fixed time interval in receiveR 2016-11-10 14:37:18 +01:00
4b99ff7fbe reset fpga implemented, changed receiver configuration warning prints, powerchip implemented 2016-11-03 12:31:34 +01:00
12574f4c05 merged zmqdata to developer 2016-10-20 08:46:48 +02:00
81d96a047d slsDetector/slsDetectorCommand.cpp 2016-10-20 07:31:53 +02:00
749c64204e done showing error when detectors not added in sharedmemory due to connect failure 2016-10-19 08:15:52 +02:00
e49f97a03c done showing error when detectors not added in sharedmemory due to connect failure 2016-10-19 08:10:42 +02:00
6da59ca382 somewhere, but weird threads 2016-10-05 15:26:58 +02:00
7ead69a761 merged with developer after it merged with 2.1.1-rc(deactivate) 2016-10-04 14:10:52 +02:00
a4bb3fe4dd merged with 2.1.1-rc inclding deactivate detectr and receiver 2016-10-04 14:06:47 +02:00
984698efad merged with developer a lot of bug fixes from 14 sep to 30 sep 2016-10-04 13:36:04 +02:00
0979d04693 works for deactivated server and receiver 2016-10-04 07:35:52 +02:00
5f4a4b0d90 maybe fixed 16 bit rate corr eiger 2016-09-23 17:15:16 +02:00
d904f7b32e adding 16 bit rate correction in eiger 2016-09-23 14:28:20 +02:00
1263e80d21 done 2016-09-16 12:49:27 +02:00
56a559090d ratecorrection error def fixed 2016-08-11 13:59:05 +02:00