1573 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	2d1c91c0e0	bug in sem for new scans	2016-12-16 14:59:55 +01:00
Dhanya Maliakal	b403aa20a6	Merge branch '2.2-rc' into hdf5	2016-12-16 14:51:08 +01:00
Dhanya Maliakal	64843c1c76	made the scans work, where the the dummy message from rxr doesnt stop it from listening for the scans/measurement, only at set join thread	2016-12-16 14:46:54 +01:00
Dhanya Maliakal	a971d87008	Merge branch '2.2-rc' into hdf5	2016-12-13 13:23:06 +01:00
Dhanya Maliakal	2a508435c7	change the filenaming according to det position and not det id	2016-12-13 11:41:27 +01:00
Dhanya Maliakal	e7621a6cd0	moving towards c++ api	2016-12-12 14:24:11 +01:00
Dhanya Maliakal	a67f9d50de	removed the allocating of memory for eiger and jungfrau to receive data via tcp from detector as this will not happen	2016-12-02 12:47:01 +01:00
Dhanya Maliakal	dd9387ef29	using detid to calculte zmq port in case of shmget error and det id does not start with 0 and 1 as in receiver zmq server ports	2016-12-02 08:53:08 +01:00
Dhanya Maliakal	790cef37ff	updaterev	2016-11-30 11:20:16 +01:00
Dhanya Maliakal	466f1506a5	bottom is defined as flippeddatax in config file, not anymore as argument for receiver	2016-11-30 10:36:34 +01:00
Dhanya Maliakal	52dbb7f9fc	smaller changes to make arguments const	2016-11-25 12:22:00 +01:00
Dhanya Maliakal	c70f453de4	changed everything to depend on receiver online shared memory flag, and if it is online is only checked rarely	2016-11-22 14:01:07 +01:00
Dhanya Maliakal	09d146ee55	changed a printout	2016-11-22 11:39:47 +01:00
Dhanya Maliakal	394526a9c3	removed zmq threads from client and made it receive packets via for loop	2016-11-22 11:05:42 +01:00
Dhanya Maliakal	0ed9ee0e5d	fixing the 32 bit crash and empty plot using zmq	2016-11-21 12:02:45 +01:00
Dhanya Maliakal	9d106f6c93	changed clock for jungfrau, maybe other debugging stuff outside this folder	2016-11-21 09:21:30 +01:00
Dhanya Maliakal	ebf102b8d9	updaterev	2016-11-14 11:57:53 +01:00
Dhanya Maliakal	c639477f28	adding exptime to receiver for file header	2016-11-14 11:57:29 +01:00
Dhanya Maliakal	b980640a4c	updaterev	2016-11-11 14:44:56 +01:00
Dhanya Maliakal	7ffba557f6	updatereveiger	2016-11-11 14:44:42 +01:00
Dhanya Maliakal	f13a42feeb	eigerupdaterev	2016-11-11 14:43:55 +01:00
Dhanya Maliakal	b1a3a224ff	implemented high voltage for normal modules	2016-11-11 14:43:18 +01:00
Dhanya Maliakal	44d6b0ffc0	fixed time interval in receiveR	2016-11-10 14:37:18 +01:00
Dhanya Maliakal	753ed306d9	changes to include eiger in gui	2016-11-10 08:41:46 +01:00
Anna Bergamaschi	cb879c61ca	changes for new chipterboard -now works with reduced dynamic range and analog/digital readout	2016-11-09 11:36:59 +01:00
Dhanya Maliakal	d30e4a4d1c	updaterev	2016-11-08 15:26:18 +01:00
Dhanya Maliakal	400eef6712	updaterevjungfrau	2016-11-08 15:25:56 +01:00
Dhanya Maliakal	475e217cc5	adding binary	2016-11-08 15:25:16 +01:00
Dhanya Maliakal	5c9d610dc4	updaterev	2016-11-08 15:23:56 +01:00
Dhanya Maliakal	dec82ab850	included datastream command earlier but not working yet	2016-11-08 15:21:56 +01:00
Dhanya Maliakal	8aea36b4ef	fixed jungfrau configure bug by getting rid of gb10reset at configure	2016-11-08 09:35:34 +01:00
Dhanya Maliakal	52cf790dde	deletion of retval in getdatafrom, client	2016-11-07 17:57:03 +01:00
Dhanya Maliakal	39a2317d8d	somewhere	2016-11-07 17:34:41 +01:00
Dhanya Maliakal	e4dcd1cb6b	setting and getting printouts, changed the rx mess to 1000	2016-11-07 15:34:47 +01:00
Dhanya Maliakal	8caa9d8779	fixed jungfrau problem, changed set receiver to updatedetector before	2016-11-04 17:14:47 +01:00
Dhanya Maliakal	25780a2b4f	fixed jungfrau gui	2016-11-04 13:45:24 +01:00
Dhanya Maliakal	771e5323b4	added binary	2016-11-04 12:10:36 +01:00
Dhanya Maliakal	79d5a24af4	debugging	2016-11-04 12:02:37 +01:00
Dhanya Maliakal	6f60f011d1	something	2016-11-03 16:26:11 +01:00
Dhanya Maliakal	20918f2d52	versioning done	2016-11-03 13:22:19 +01:00
Dhanya Maliakal	df3e0f3f93	updaterev	2016-11-03 12:32:59 +01:00
Dhanya Maliakal	4b99ff7fbe	reset fpga implemented, changed receiver configuration warning prints, powerchip implemented	2016-11-03 12:31:34 +01:00
Dhanya Maliakal	0aecad6644	changed dac values, fixed settings bug of not looking at nchan,nchips, , fixed clock divider, changed usleep in configuremac	2016-11-03 09:16:01 +01:00
Dhanya Maliakal	754a4f8bdc	q for quit	2016-11-02 16:37:37 +01:00
Thattil Dhanya	40babc23a3	progress uncommented	2016-11-02 16:24:23 +01:00
Dhanya Maliakal	941b3dbb02	progress uncommented	2016-11-02 16:09:22 +01:00
Dhanya Maliakal	55c35b6669	merged	2016-11-02 14:36:21 +01:00
Dhanya Maliakal	fa0580ccac	to see the frames	2016-11-02 11:01:59 +01:00
Dhanya Maliakal	5783e3f9d2	counters frame delay	2016-11-02 11:00:51 +01:00
Dhanya Maliakal	50596d87d1	included the delay and frame counters	2016-11-02 10:56:13 +01:00