559 Commits

Author	SHA1	Message	Date
Dhanya Maliakal	a1fc93b398	changes including warnings and zmq	2017-05-04 17:52:58 +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	b401a6c33b	in between stage	2017-04-04 11:20:38 +02:00
Dhanya Maliakal	fb0b0b96ec	need to automize parameter passing	2017-03-24 16:58:17 +01:00
Dhanya Maliakal	a11313fe96	removed copies	2017-03-24 15:15:30 +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	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	e450f5ec6a	updaterev	2017-03-23 15:17:34 +01:00
Dhanya Maliakal	70a7217353	changed the header size to a better number	2017-03-23 15:17:21 +01:00
Dhanya Maliakal	da8d535dae	updaterev	2017-03-23 14:09:01 +01:00
Dhanya Maliakal	404be013a2	changes to new callback arguments without filepointer	2017-03-23 14:08:43 +01:00
Dhanya Maliakal	54371bc6be	updaterev	2017-03-23 13:48:18 +01:00
Dhanya Maliakal	0814f6369d	udpaterev	2017-03-23 13:46:16 +01:00
Dhanya Maliakal	6f34dddb5a	changed the file header size t0 1kb and changed its description in the header	2017-03-23 13:41:37 +01:00
Dhanya Maliakal	b9eb3d5a52	somewere stuck with virtual template overloading	2017-03-23 11:56:17 +01:00
Dhanya Maliakal	78958c7699	updaterev	2017-03-20 09:30:15 +01:00
Dhanya Maliakal	575c9617c7	fixed gui for new header	2017-03-20 09:28:15 +01:00
Dhanya Maliakal	1413244617	update rev	2017-03-15 15:02:28 +01:00
Dhanya Maliakal	9f68fc6f3b	fixed call backs with new standard header	2017-03-15 15:00:25 +01:00
Dhanya Maliakal	36e92c194d	changes for callback to work	2017-03-14 08:23:47 +01:00
Dhanya Maliakal	53be854efd	including subframe number	2017-03-13 11:33:06 +01:00
Dhanya Maliakal	300b014f73	somewhere	2017-03-10 10:51:28 +01:00
Dhanya Maliakal	1e94ec0c6a	fixed short gotthard	2017-03-09 13:28:03 +01:00
Dhanya Maliakal	86018684c9	made it work for gotthard	2017-03-09 11:40:48 +01:00
Dhanya Maliakal	0dccd78567	not yet gotthard	2017-03-08 14:37:00 +01:00
Dhanya Maliakal	0e4c7a9494	adjusted for jungfrau	2017-03-07 14:59:38 +01:00
Dhanya Maliakal	50f8366bc2	small changes for jungfrau, but also for the gui	2017-03-03 15:57:48 +01:00
Dhanya Maliakal	2505369c08	updaterev	2017-03-03 09:07:46 +01:00
Dhanya Maliakal	80fb0a99a8	Merge branch '2.3-rc' into hdf5	2017-03-03 09:06:49 +01:00
Dhanya Maliakal	053e05628f	callback	2017-03-03 08:50:55 +01:00
Dhanya Maliakal	d8b0a13ee2	changed to have only one virtual file with bunch id, subfnum and data datasets all linked in master file	2017-03-03 08:39:53 +01:00
Dhanya Maliakal	537260879a	created virtual datasets for bunchid and subframenumber	2017-03-02 11:43:11 +01:00
Dhanya Maliakal	a7309be567	created links to virtual files in master file	2017-03-01 08:44:43 +01:00
Dhanya Maliakal	829ba49c1c	moving subframenumber into a 32 bit number, also in stremer, changing json header to mention 4 bit and version number	2017-02-28 15:30:53 +01:00
Dhanya Maliakal	447c5bb8fe	gui works	2017-02-28 13:42:56 +01:00
Dhanya Maliakal	3aac30b8ee	added zmqasocket	2017-02-27 16:06:58 +01:00
Dhanya Maliakal	3b07afe3fc	in the process of streamer	2017-02-27 15:38:46 +01:00
Dhanya Maliakal	936dfea8a7	works so far, no gui yet	2017-02-22 12:01:00 +01:00
Dhanya Maliakal	9e21583331	virtual, master all works, still to do rewriting file in an acquisition	2017-02-21 15:13:59 +01:00
Dhanya Maliakal	2cd38fefcd	master hdf5 does not work, but so far good	2017-02-16 12:48:15 +01:00
Dhanya Maliakal	a1f00518b8	updaterev	2017-02-10 11:50:24 +01:00
Dhanya Maliakal	54f92fb26c	changed namings	2017-02-10 10:41:01 +01:00
Dhanya Maliakal	b260d08225	somewhere	2017-02-10 10:08:00 +01:00
Dhanya Maliakal	c89f6e649c	fnum wrong, need to add file features	2017-02-07 08:52:27 +01:00
Dhanya Maliakal	d95aaa2089	somewhere in between.. next step include generalData pointer in listerner and dataprocessor calss in constructor and a setter	2017-01-31 08:42:16 +01:00