336 Commits

Author SHA1 Message Date
Dhanya Maliakal
7fc82723b5 some changes 2016-11-01 14:04:31 +01:00
Dhanya Maliakal
7374a37115 back with checking online, got rid of getframescaught altogether 2016-11-01 10:03:38 +01:00
Dhanya Maliakal
59b5844de6 got rid of check if online 2016-11-01 09:55:38 +01:00
Dhanya Maliakal
cf8bbad937 got rid of check if online 2016-11-01 09:46:29 +01:00
Dhanya Maliakal
2edeb74213 got rid of check if online 2016-11-01 09:21:26 +01:00
Dhanya Maliakal
18c6e8208a removed bug, setting dr24 sets dr 32 also for eiger, also added server executable 2016-10-25 12:01:31 +02:00
Dhanya Maliakal
f535e11bba check not done 2016-10-18 15:31:48 +02:00
Dhanya Maliakal
028ba57876 check for giving an error in gui if cannot connect to hostname 2016-10-18 15:06:01 +02:00
Dhanya Maliakal
ca89835035 check for giving an error in gui if cannot connect to hostname 2016-10-18 15:03:44 +02:00
Dhanya Maliakal
cce93ebbcf removing the check for receiver to update data threads upon configuration 2016-10-07 07:54:26 +02:00
Dhanya Maliakal
ed8a779f7f thread starting if rxr closed and others 2016-10-06 15:50:02 +02:00
Dhanya Maliakal
6da59ca382 somewhere, but weird threads 2016-10-05 15:26:58 +02:00
Dhanya Maliakal
7ead69a761 merged with developer after it merged with 2.1.1-rc(deactivate) 2016-10-04 14:10:52 +02:00
Dhanya Maliakal
a4bb3fe4dd merged with 2.1.1-rc inclding deactivate detectr and receiver 2016-10-04 14:06:47 +02:00
Dhanya Maliakal
984698efad merged with developer a lot of bug fixes from 14 sep to 30 sep 2016-10-04 13:36:04 +02:00
Dhanya Maliakal
0979d04693 works for deactivated server and receiver 2016-10-04 07:35:52 +02:00
Dhanya Maliakal
f513fb06fb switching the gpio definitions into function implementation 2016-09-30 07:56:54 +02:00
Dhanya Maliakal
813b7ba6e7 added prgoramfpga functionality, currently gpio definitions required in /etc/rc file, will rectify in later commits 2016-09-29 10:28:27 +02:00
Dhanya Maliakal
5c81abdce0 jungfrau programming change 2016-09-26 12:00:23 +02:00
Dhanya Maliakal
5f4a4b0d90 maybe fixed 16 bit rate corr eiger 2016-09-23 17:15:16 +02:00
Dhanya Maliakal
d904f7b32e adding 16 bit rate correction in eiger 2016-09-23 14:28:20 +02:00
Dhanya Maliakal
a1df8bdc15 done for eiger, some checks for frameindex=-1,socket closing earlier than last socket etc 2016-09-20 15:11:39 +02:00
Dhanya Maliakal
1263e80d21 done 2016-09-16 12:49:27 +02:00
Dhanya Maliakal
1da4b07e73 works, need to do json header and send dataready 2016-09-15 17:15:55 +02:00
Dhanya Maliakal
a821442b1a almosst 2016-09-15 12:16:01 +02:00
Dhanya Maliakal
0f9a841c4a almost done 2016-09-15 10:17:16 +02:00
Dhanya Maliakal
33807b7fac Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata 2016-09-14 10:43:33 +02:00
Dhanya Maliakal
652d29f2d9 almost done 2016-09-09 17:51:36 +02:00
988426dc96 Added adc command for chiptestboard 2016-09-05 10:49:47 +02:00
b90ca7b864 Added DACs for ne chiptestboard; fixed problem on dac14/highvoltage for moench 2016-08-16 15:15:24 +02:00
Dhanya Maliakal
597f5e5d2a got rid of unnecesaary handshaking for -1 in dynamic range in receiver 2016-08-15 11:15:52 +02:00
Dhanya Maliakal
1f9dc775f6 ensure receiver is updated when detector timer values are updated (force_update) 2016-08-12 17:44:28 +02:00
Dhanya Maliakal
04f2a5c5ed temporarily removed parallel start to debug bug, fixed flat channel bug, fixed bad channel bug 2016-08-12 10:53:26 +02:00
Dhanya Maliakal
509c4845c2 got rid of annoying get status message 2016-08-08 17:11:30 +02:00
Dhanya Maliakal
56aaaaf182 fixed rate correction to not include 16 bit dr 2016-08-08 15:52:09 +02:00
Dhanya Maliakal
ef9d64de64 got rid of <0.00015 rate correction error check 2016-08-04 17:27:45 +02:00
Dhanya Maliakal
29ba1f4042 changed transmission delay commands to go through network parameters and included 10g flow control 2016-08-04 17:21:16 +02:00
Dhanya Maliakal
d28d737fb9 transmission delay added 2016-08-03 17:03:37 +02:00
Dhanya Maliakal
1db5ef4fd4 added 2 gain settings to eigeR 2016-08-03 10:35:11 +02:00
Dhanya Maliakal
c0db1a89a8 deactivate for eiger 2016-08-02 10:32:37 +02:00
Dhanya Maliakal
ee26339fd7 added more accurate temperature sensors for eiger, and to gui 2016-07-22 10:40:58 +02:00
Dhanya Maliakal
bdf725be48 fixed the update on detector udpating acq period with subexptime 2016-07-15 15:45:40 +02:00
Dhanya Maliakal
4939e47305 fixed dimensions, fixed rate corr bug, moved rate corr to server because config resets memory and ratecorr depends on client variables 2016-07-14 16:23:03 +02:00
Dhanya Maliakal
09d0d3ba22 parallized setup receiver 2016-07-07 15:55:22 +02:00
Dhanya Maliakal
6823e3065b feature: tau is now read from calib file. if not there, it is set to defalt in server value, but switched off. load trimbits will not touch rate correction 2016-07-05 12:01:41 +02:00
Dhanya Maliakal
35b02c9cf0 added burst_trigger mode for eiger to replace trigger_readout mode 2016-07-04 15:47:32 +02:00
Dhanya Maliakal
94d748a411 start receiver lets detectr prepare for acquistion only if receiver worked, removed to allow other receivers to work using receiver start, status start 2016-06-10 11:03:36 +02:00
Dhanya Maliakal
ae4eb88553 status start acqisition also has detector index now, eiger always has detector index 2016-05-11 11:29:27 +02:00
Dhanya Maliakal
7440ee2255 receiver udp parameters should be sent to receiver everytime if rx_hostname is set 2016-05-10 17:06:46 +02:00
Dhanya Maliakal
0511242846 insignificant details 2016-05-09 11:06:32 +02:00