3153 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	bdff083402	Merge branch '2.3-rc' into hdf5	2017-03-03 09:05:40 +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	fa6d18e9b2	moving subframenumber into a 32 bit number	2017-02-28 15:29:53 +01:00
Anna Bergamaschi	fd42fad045	Added sebastians python script for interpolation - final debug version	2017-02-28 15:13:58 +01:00
Dhanya Maliakal	447c5bb8fe	gui works	2017-02-28 13:42:56 +01:00
Dhanya Maliakal	475f0692a0	Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 2.3-rc	2017-02-28 13:42:16 +01:00
Dhanya Maliakal	2024eb5d6e	gui works	2017-02-28 13:14:18 +01:00
Dhanya Maliakal	cf8b53adff	gui works	2017-02-28 13:14:06 +01:00
Dhanya Maliakal	3aac30b8ee	added zmqasocket	2017-02-27 16:06:58 +01:00
Dhanya Maliakal	62de278f24	bug fix: loading trimbit file should not care about settings	2017-02-27 16:05:27 +01:00
Dhanya Maliakal	3b07afe3fc	in the process of streamer	2017-02-27 15:38:46 +01:00
Anna Bergamaschi	d90db50a60	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2017-02-23 12:05:55 +01:00
Anna Bergamaschi	f12df80c5b	some changes for chiptest board and mythen server now compiles	2017-02-23 12:05:34 +01:00
Dhanya Maliakal	936dfea8a7	works so far, no gui yet	2017-02-22 12:01:00 +01:00
Erik Frojdh	9e9c109898	adding cmath and std:round interp	2017-02-22 11:31:01 +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	19460a03f5	sending position id and num detectors in x and y dir	2017-02-21 15:13:27 +01:00
Gemma Tinti	72c2fbee9c	manual eiger	2017-02-21 09:20:16 +01:00
Dhanya Maliakal	2cd38fefcd	master hdf5 does not work, but so far good	2017-02-16 12:48:15 +01:00
Dhanya Maliakal	549e346ad4	Merge branch '2.3-rc' into hdf5	2017-02-10 11:56:37 +01:00
Dhanya Maliakal	111f8beab3	updaterev	2017-02-10 11:51:29 +01:00
Dhanya Maliakal	4c351ba686	updated server with version variables	2017-02-10 11:51:05 +01:00
Dhanya Maliakal	a1f00518b8	updaterev	2017-02-10 11:50:24 +01:00
Dhanya Maliakal	3d2264fa56	updaterev	2017-02-10 11:50:13 +01:00
Dhanya Maliakal	3e9476cca2	updaterev	2017-02-10 11:49:58 +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	5287441a65	removed warning	2017-02-07 08:52:05 +01:00
Dhanya Maliakal	9b3f4a3a66	commonFiles/error_defs.h	2017-02-03 14:34:05 +01:00
Dhanya Maliakal	1decd2dd89	Merge branch '2.3-rc' into hdf5	2017-02-03 14:30:09 +01:00
Dhanya Maliakal	490e756622	added the servers	2017-02-03 12:31:33 +01:00
Dhanya Maliakal	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
Dhanya Maliakal	0896704de7	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:33 +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
Dhanya Maliakal	01d54a7a4c	Complete rewrite of receiver, with new changes	2017-01-27 15:40:36 +01:00
Dhanya Maliakal	70a7d83175	somewhere	2017-01-18 15:22:05 +01:00
Dhanya Maliakal	f6927ad1bf	in between	2017-01-17 10:56:01 +01:00
Dhanya Maliakal	bd31ac1d52	changes to variable name	2017-01-17 10:55:43 +01:00
Dhanya Maliakal	b16d087fd1	Merge branch '2.2-rc' into hdf5	2017-01-06 15:17:40 +01:00
Dhanya Maliakal	3563f0deec	Merge branch '2.2-rc' into developer	2017-01-06 15:17:14 +01:00
Dhanya Maliakal	111856ed7b	hv should work now	2017-01-06 15:16:05 +01:00
Dhanya Maliakal	0fdbac981e	should work for serial comm hv for 9m	2017-01-05 12:58:49 +01:00
Dhanya Maliakal	adb5ab5ed1	chunked upto 1000 and new dataset every 10000	2017-01-03 12:11:55 +01:00
Dhanya Maliakal	abb5bfb6e4	creating new datasets every 10,000 images in same file	2017-01-03 08:57:59 +01:00
Anna Bergamaschi	987aeda6fb	sorted out problem with CPU read out	2016-12-22 17:24:53 +01:00