640 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	04165a9da8	rest implementation, index issues	2017-07-13 14:44:34 +02:00
Dhanya Maliakal	e3667f6827	can set zmqport from receiver	2017-07-13 12:18:07 +02:00
Dhanya Maliakal	68b1959a85	excluding detector server directories in makefile	2017-07-11 11:16:37 +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	a583f3d6e2	some more changes to make file for automatic versioning	2017-07-10 11:18:41 +02:00
Dhanya Maliakal	1e50bc4cc0	conflict git	2017-07-03 17:44:52 +02:00
Dhanya Maliakal	374b07a126	merge developer	2017-07-03 17:42:06 +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	b4309a9f60	changed jungfrau temperature conversion but binary to follow	2017-07-03 14:45:44 +02:00
Dhanya Maliakal	99dad79572	Somewhere	2017-07-03 13:46:06 +02:00
Dhanya Maliakal	da4ffb235c	ensuring set detector type is the first call	2017-07-03 13:32:10 +02:00
Dhanya Maliakal	b05e9c194a	makefiles and versioning update complete	2017-06-29 17:10:10 +02:00
Dhanya Maliakal	1a74ceca3e	ensuring file permissions	2017-06-28 18:16:55 +02:00
Dhanya Maliakal	7990dd6f77	fixed makefile and included correct versioning while compiling	2017-06-28 18:13:47 +02:00
Dhanya Maliakal	c2624daa9a	uncommented a print	2017-06-28 10:27:40 +02:00
Dhanya Maliakal	c2980b3c44	changes for setting threshold without trimbits for eiger	2017-06-28 10:24:07 +02:00
Dhanya Maliakal	ca358e4d17	changes to the eiger and jungfrau server regarding getnumberofchans etc a typo bug resulting in could not allocate	2017-06-27 17:46:32 +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	cd86c708dc	updaterev	2017-06-22 14:36:02 +02:00
Dhanya Maliakal	fe73e09aa4	removing unnecessary printouts, ensuring lost packets are 0xff	2017-06-21 17:05:47 +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	a46a8cc686	updaterev	2017-06-14 11:41:11 +02:00
Dhanya Maliakal	84d07a3e0c	updaterev	2017-06-14 11:39:07 +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	cb7b8713cf	fixed the precision problem in converting double to long long int (0.0000325 *1E9), cant find another example	2017-06-13 12:58:56 +02:00
Dhanya Maliakal	3d8903b2da	updaterev	2017-06-12 18:54:58 +02:00
Dhanya Maliakal	3fbbeea434	update rev	2017-06-12 18:51:52 +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	0722ef3125	changes including warnings and zmq	2017-05-04 17:52:47 +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	e9f6dcf479	strtok is not thread safe..used to set receiver udp ip etc to detector, fixed	2017-05-01 10:24:16 +02:00
Dhanya Maliakal	536f8937cb	merging	2017-03-24 09:10:09 +01:00
Dhanya Maliakal	5c230e2ac5	updaterev	2017-03-23 13:48:12 +01:00
Dhanya Maliakal	9e658e7947	udpaterev	2017-03-23 13:46:02 +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	1ab80b0517	updaterev	2017-03-20 09:28:02 +01:00
Dhanya Maliakal	4b388f56b2	fixed gui for new header	2017-03-20 09:27:38 +01:00
Dhanya Maliakal	dc77b07c92	update rev	2017-03-15 15:02:22 +01:00
Dhanya Maliakal	ecaa8e45a4	some changes to the command help	2017-03-15 14:52:19 +01:00
Dhanya Maliakal	0a1aaec708	resolved the recovering from receiver start error , but still does not acknowledge error in gui	2017-03-10 13:24:00 +01:00
Dhanya Maliakal	cad8ffc0c6	resolved the recovering from receiver start error , but still does not acknowledge error in gui	2017-03-10 13:07:33 +01:00
Dhanya Maliakal	978b54dff9	somewhere	2017-03-10 10:51:37 +01:00
Dhanya Maliakal	300bf85dae	uncommented extra comments	2017-03-09 11:40:26 +01:00
Dhanya Maliakal	f3bf331b5f	solved bug of decoding data with distorted image	2017-03-03 13:48:47 +01:00
Dhanya Maliakal	7e00d9f395	Merge branch 'developer' into hdf5	2017-03-03 10:06:34 +01:00
Dhanya Maliakal	ab4572f544	updaterev	2017-03-03 09:07:36 +01:00
Dhanya Maliakal	bdff083402	Merge branch '2.3-rc' into hdf5	2017-03-03 09:05:40 +01:00
Dhanya Maliakal	62de278f24	bug fix: loading trimbit file should not care about settings	2017-02-27 16:05:27 +01:00