3468 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	f53770a2fc	some changes to remove possible warnings	2017-05-11 14:41:07 +02:00
lopez_c	0e9cf558b4	Modified JUNGFRAU_MODULE_ID to match the detector type definition that is tx. with the new header.	2017-05-10 16:47:10 +02:00
Dhanya Maliakal	95bf19a417	deleting socket and insignificant changes	2017-05-08 15:08:59 +02:00
Dhanya Maliakal	8471765e30	insignificant	2017-05-08 14:48:29 +02:00
Dhanya Maliakal	6d7fb07a4c	fixing the standard header pointers for it to work	2017-05-08 12:33:31 +02:00
Dhanya Maliakal	1e8c7bd637	not necessary to check file name	2017-05-08 12:33:00 +02:00
Dhanya Maliakal	a1fc93b398	changes including warnings and zmq	2017-05-04 17:52:58 +02:00
Dhanya Maliakal	0722ef3125	changes including warnings and zmq	2017-05-04 17:52:47 +02:00
Dhanya Maliakal	49b4ae2f56	changed zmq method, and resolved warnings and from esrf	2017-05-03 17:57:56 +02:00
Dhanya Maliakal	e2d1d58acf	Alejandro changes from ESRF	2017-05-02 08:36:36 +02:00
Dhanya Maliakal	44339d3b89	c_Str() not access global variables from thread	2017-05-02 08:25:45 +02:00
Dhanya Maliakal	404bb4a653	changed -lpthread to -pthread	2017-05-02 08:15:11 +02:00
Dhanya Maliakal	066550d38c	zmq changes for no dummy data end	2017-05-01 14:02:13 +02:00
Dhanya Maliakal	020eaded36	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-05-01 13:11:16 +02:00
Dhanya Maliakal	445da80df8	resolved warnings, also from esrf: todo: include changes in zmq	2017-05-01 13:11:10 +02:00
lopez_c	f937b8ca5d	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-05-01 12:21:07 +02:00
l_lopez	7901b6f463	Modified "calcChecksum" function in jungfrauDetectorServer/firmware_funcs.c to compute properly the new IP header checksum for a new application header of 48 bytes.	2017-05-01 12:14:06 +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	264485c8ff	changed all -lpthread to -pthread	2017-05-01 09:53:37 +02:00
Dhanya Maliakal	3525bb3f9f	changed all -lpthread to -pthread	2017-05-01 09:44:33 +02:00
Dhanya Maliakal	78d1504d66	changed all -lpthread to -pthread	2017-05-01 09:39:19 +02:00
Dhanya Maliakal	c6cb499758	added the jungfrau binary	2017-04-28 13:41:08 +02:00
Dhanya Maliakal	bc57ea5725	added the binary	2017-04-28 11:31:12 +02:00
Dhanya Maliakal	27f752ff9e	removed wrong edits in merging (not reflected in git browser, weird); changing server names anyway	2017-04-28 11:30:09 +02:00
Dhanya Maliakal	b401a6c33b	in between stage	2017-04-04 11:20:38 +02:00
Gemma Tinti	faefcc4799	Merge branch '2.3' into developer	2017-03-29 11:25:28 +02:00
Gemma Tinti	1afb9e3e48	manual	2017-03-29 11:23:44 +02:00
Gemma Tinti	09d3372cc0	manual	2017-03-29 10:11:16 +02:00
Gemma Tinti	671587c029	manual	2017-03-29 10:09:52 +02:00
Dhanya Maliakal	fb0b0b96ec	need to automize parameter passing	2017-03-24 16:58:17 +01:00
Dhanya Maliakal	72d89fefc3	modified release	2017-03-24 16:58:00 +01:00
Dhanya Maliakal	a11313fe96	removed copies	2017-03-24 15:15:30 +01:00
Dhanya Maliakal	aba3a67b80	Merge branch '2.3' into developer	2017-03-24 14:20:38 +01:00
Dhanya Maliakal	cacb4c9d93	updaterev	2017-03-24 13:42:11 +01:00
Dhanya Maliakal	86490226ed	removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled	2017-03-24 13:41:56 +01:00
Dhanya Maliakal	eb203c93b2	removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled	2017-03-24 13:41:30 +01:00
Dhanya Maliakal	2bb8fa596a	from the merge of 2.3	2017-03-24 12:22:49 +01:00
Dhanya Maliakal	bb52676f50	merged from 2.3 without udpstandard	2017-03-24 10:34:31 +01:00
Dhanya Maliakal	536f8937cb	merging	2017-03-24 09:10:09 +01:00
Dhanya Maliakal	e8b14f8c8a	done	2017-03-24 08:26:10 +01:00
Dhanya Maliakal	aca09bcd4e	done	2017-03-24 08:25:50 +01:00
Dhanya Maliakal	fdb4fa28db	retrying	2017-03-24 08:22:50 +01:00
Dhanya Maliakal	93362963e2	removed changes for test	2017-03-24 08:12:38 +01:00
Dhanya Maliakal	33a7375c72	changes to test	2017-03-24 08:12:10 +01:00
Dhanya Maliakal	97bad0fcb9	changes	2017-03-24 08:06:09 +01:00
Dhanya Maliakal	059711af37	retrying a test	2017-03-24 07:59:36 +01:00
Dhanya Maliakal	f0c5106764	trying a test	2017-03-24 07:59:14 +01:00
Dhanya Maliakal	4182615aa9	trying a test	2017-03-24 07:58:27 +01:00
Dhanya Maliakal	ff2c42e921	Merge branch '2.3' into developer	2017-03-23 15:38:48 +01:00
Dhanya Maliakal	44be9829d4	removed anna from support as she prefered it	2017-03-23 15:38:24 +01:00