240 Commits

Author	SHA1	Message	Date
Erik Frojdh	212218396a	removal of using namespace std from theadFiles	2018-05-24 14:47:45 +02:00
Erik Frojdh	621b7cfb2a	adding std:: where needed	2018-05-24 14:11:30 +02:00
Dhanya Thattil	cb635d800a	eiger server: added overflow, noverflow to the flags to show/not show saturation when there is overflow in any of the single subframes in 32 bit mode	2018-05-22 18:43:13 +02:00
Dhanya Thattil	d3a0319863	esrf changes: Listener, DataProcessor, DataStreamer, Fifo, ZmqSocket constructors return an exception when it fails	2018-05-02 16:49:27 +02:00
Dhanya Thattil	1152555663	esrf changes: rx_udpsocksize sets/gets udp socket buffer size to be set, rx_realudpsocksize gets the real udp sock size buffer. At receiver config and at rx_udpsocksize command, dummy udp sockets created to know if set udp sock size fails (if fail, set to previous value), and also to get the real udp sock buffer size	2018-05-01 11:55:48 +02:00
Dhanya Thattil	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
Dhanya Thattil	2bd8e6c166	zmq fixed to have additional json headers using rx_zmqjsonheader	2018-04-09 16:33:14 +02:00
Dhanya Thattil	5340b8ef24	added error mask for loading/writing config file to be caught by python	2018-03-26 18:07:10 +02:00
Dhanya Thattil	897cbac27d	merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file	2018-02-07 11:02:36 +01:00
Dhanya Thattil	618f6291cf	server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number	2018-02-07 09:23:52 +01:00
Dhanya Thattil	3da6a6df65	merge conflict removed, jungfrau server and eiger server re compiled	2018-02-05 12:33:05 +01:00
Dhanya Thattil	5d04067973	added auto comp disable feature	2018-02-02 18:01:01 +01:00
Dhanya Maliakal	08fda2b662	in between in terms of mythen3 server, done with setdac and set power	2018-02-01 17:48:43 +01:00
Andrä Marie	3aeb3f58d1	first mythen3Server commit	2018-01-22 14:01:46 +01:00
Andrä Marie	92b4b3324e	first mythen3 server commit	2018-01-18 09:25:06 +01:00
Dhanya Maliakal	2d6e4c95a2	temp_threshold, temp_control, temp_event done	2018-01-11 15:37:24 +01:00
Dhanya Maliakal	12348ac76c	merge conflict fix	2017-12-01 09:20:44 +01:00
Dhanya Maliakal	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
Dhanya Maliakal	5b88203bd9	merge conflict from 3.0.1 to restream stop from recieveR	2017-11-30 19:05:35 +01:00
Dhanya Maliakal	ca855e6d39	restream stop from receiver	2017-11-30 18:37:11 +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	956625bb50	Merge branch '3.0' into developer	2017-11-15 10:35:20 +01:00
Dhanya Maliakal	6d6133be59	Merge branch '3.0' into zmqseparate	2017-11-15 10:34:30 +01:00
Dhanya Maliakal	dd1cf42a73	proper fix for settings, including dacs	2017-11-14 17:51:13 +01:00
Dhanya Maliakal	dda86cfe9b	somewhere in separating zmq rxr and client	2017-11-14 16:26:17 +01:00
Dhanya Maliakal	6ff249c3f2	Merge branch 'developer' into gappixels	2017-10-27 16:18:52 +02:00
Dhanya Maliakal	7ff23b25b3	merge bug fix of set module	2017-10-27 16:16:29 +02:00
Dhanya Maliakal	1420921291	Merge branch '3.0' into 3.0.1	2017-10-27 15:47:15 +02:00
Dhanya Maliakal	92f988ddc1	somewhere	2017-10-27 14:00:57 +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	812606a7b4	conflict resolution with developer	2017-10-03 15:12:49 +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	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	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	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	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	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
Dhanya Maliakal	e3667f6827	can set zmqport from receiver	2017-07-13 12:18:07 +02:00
Dhanya Maliakal	c2980b3c44	changes for setting threshold without trimbits for eiger	2017-06-28 10:24:07 +02:00
Dhanya Maliakal	5176ad521f	merged with annas, removed a <<< head merge conflict	2017-06-14 11:36:44 +02:00
Anna Bergamaschi	cbbdd8eeab	Merged to developer	2017-06-13 15:30:33 +02:00
Anna Bergamaschi	8caab4e562	Modicfications for chiptestboard and moench03 module	2017-06-13 15:28:45 +02:00
Dhanya Maliakal	132a9bbfe9	solved many bugs, but cannot get data in eiger	2017-06-09 16:02:58 +02:00
Dhanya Maliakal	c755a8974c	done, but need to compile	2017-06-09 11:42:25 +02:00
Dhanya Maliakal	0254ff0281	cleaning up of servers	2017-06-02 19:29:34 +02:00
Dhanya Maliakal	7e00d9f395	Merge branch 'developer' into hdf5	2017-03-03 10:06:34 +01:00