8 Commits

Author	SHA1	Message	Date
Dhanya Thattil	897cbac27d	merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file	2018-02-07 11:02:36 +01:00
Anna Bergamaschi	31589ce352	added and fixed gotthard 25um file and zmq photon finder	2017-12-19 13:40:05 +01:00
Dhanya Maliakal	24c305ec59	solved conflicts from merge of version being used to binary	2017-12-06 19:07:06 +01:00
Dhanya Maliakal	c4a242e10a	changed all variables from svn to git, included --version for receiver binary	2017-12-06 10:29:57 +01:00
Dhanya Maliakal	99037449f4	in between moench stuff	2017-11-20 14:23:32 +01:00
Dhanya Maliakal	2b3d2bb4d7	removed changing number of samples by setting dynamic range	2017-09-21 16:36:33 +02:00
Dhanya Maliakal	aef462da32	merge error fixed	2017-09-08 09:31:26 +02:00
Anna Bergamaschi	d5f80831dd	Changes to jctb server to correctly change the power supplies	2016-08-30 09:30:31 +02:00