1053 Commits

Author SHA1 Message Date
Dhanya Maliakal
98ef40b1b6 Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detector_software into release 2016-02-24 18:05:39 +01:00
Dhanya Maliakal
5af05c24c1 added iodelay with setttings 2016-02-24 18:05:17 +01:00
d8007477b5 High Voltage index changed for jungfrau 2016-02-22 15:11:30 +01:00
e7a7dd8c6b Merging with anna's jungfrau detector server version 2016-02-22 15:02:42 +01:00
Dhanya Maliakal
0b1710c267 updated server bianry 2016-02-17 18:03:32 +01:00
Dhanya Maliakal
4eba07ca90 added error message tau/subexptime to error list 2016-02-17 18:01:58 +01:00
Dhanya Maliakal
cb1a30c450 added the script to change and add server with the version numbering 2016-02-17 15:18:39 +01:00
Dhanya Maliakal
8d2f54838a fixed corrections for rate correction, needed to reset daq completely 2016-02-17 15:17:40 +01:00
Dhanya Maliakal
764078d465 something 2016-02-16 11:07:12 +01:00
Dhanya Maliakal
db2e75460e fixed bug of wrong number of frames in receiver when server starts 2016-02-12 17:26:14 +01:00
Dhanya Maliakal
a0c6aad7c6 renamed eiger server final to reflect the revision 2016-02-12 15:26:37 +01:00
Dhanya Maliakal
a3e2a6c37c removed unnecessary eiger server executables 2016-02-11 14:24:21 +01:00
Dhanya Maliakal
5d3c427f11 changed setctrbit command to resmat 2016-02-11 10:48:58 +01:00
Dhanya Maliakal
1e3f9e8ead fixed receiver toalso get frames*cycles as number of frames 2016-02-10 17:03:10 +01:00
Dhanya Maliakal
dbedc9b7df rate correction for eiger implemented 2016-02-10 11:25:58 +01:00
Dhanya Maliakal
3c4b0c24c8 rate correction for eiger implemented 2016-02-10 11:24:49 +01:00
Dhanya Maliakal
9067da5e88 rate correction for eiger implemented 2016-02-10 11:22:59 +01:00
Dhanya Maliakal
5029eb0c86 bug fixed maximum sub exposure time is in 10 ns and not ns 2016-02-08 15:25:28 +01:00
Dhanya Maliakal
f0c4a4a7e4 almost done 2016-02-08 15:20:19 +01:00
Dhanya Maliakal
cf3e736d7e fixed bug that still reads hostname and expects a 0XX format, also prints revision number in decimal and not hex 2016-02-08 11:25:10 +01:00
Dhanya Maliakal
23058987a4 mid way, had to change to fix bug 2016-02-08 11:11:36 +01:00
Dhanya Maliakal
07f1bd5c82 mid way, had to change to fix bug 2016-02-08 10:40:54 +01:00
Dhanya Maliakal
fed40b02c4 fixed measurement progress bar bug that kepts getting reset for each measurement 2016-02-05 11:29:02 +01:00
Dhanya Maliakal
03fc676b7e removed JUNGFRAU_DHANYA completely from Makefile, used N_CHAN instead of NCHAN macro since it isnot constant, and corrected registerdefs 2016-02-04 17:26:05 +01:00
Dhanya Maliakal
1fae912cb2 jungfrau server making it uniform, left to do: register confirmation and server_defs 2016-02-04 16:18:01 +01:00
Dhanya Maliakal
35631c0abb some changes with anna. more to come 2016-02-04 12:57:07 +01:00
Dhanya Maliakal
6cc22a350d Merge branch 'release' into jungfrauv1.0 2016-02-03 15:05:50 +01:00
Dhanya Maliakal
316ecf1b50 no change check 2016-02-02 11:10:49 +01:00
Dhanya Maliakal
bef8d413d6 jungfrau done but not merged 2016-01-21 14:43:44 +01:00
Dhanya Maliakal
f477b7a5ac not much changes 2016-01-19 16:25:48 +01:00
Gemma Tinti
a785eb7d5e newline after wrong command 2016-01-08 17:18:50 +01:00
Dhanya Maliakal
5c239ad45f data call back form receiver includes both x and y dimensions 2015-12-16 15:01:00 +01:00
Dhanya Maliakal
7848b79cf2 2d noop for setdetectorsize 2015-12-15 16:24:43 +01:00
Dhanya Maliakal
cd80160e7d getdetectorsize in users reflects 2d addon 2015-12-15 15:40:39 +01:00
Dhanya Maliakal
2dd2b577fd getdetectorsize in users reflects 2d 2015-12-15 15:36:49 +01:00
Dhanya Maliakal
d6c4ec184a should show progress for each measurement, not collectively 2015-12-15 14:25:53 +01:00
Dhanya Maliakal
921154e43a detsizechan or maximum detecto size for users incorrectly implemented for only 1d 2015-12-15 12:07:28 +01:00
Dhanya Maliakal
50d76f5537 iodelay set to 650, rxb_lb and rb set to 1100, 10g detectormac set to +1 of 1g 2015-12-14 15:15:27 +01:00
Dhanya Maliakal
532ac38ad5 dont know 2015-12-09 16:15:23 +01:00
Dhanya Maliakal
b05207221c ansi and test server for jungfrau server 2015-12-01 16:45:18 +01:00
Dhanya Maliakal
61f0506c2c settings for jungfrau 2015-12-01 16:43:23 +01:00
Dhanya Maliakal
58dbc59af2 masking vvalues for jungfrau 2015-11-27 17:32:46 +01:00
Dhanya Maliakal
0958a4544e jungfrau works 2015-11-27 15:56:29 +01:00
Dhanya Maliakal
ac53cb2ae4 resetting the acquiringflag whenever acquisition stop is called 2015-11-24 15:25:42 +01:00
Dhanya Maliakal
5012ea0c6c unnecessary lock in acquire 2015-11-24 13:50:42 +01:00
Dhanya Maliakal
8ae1e812e6 pulse chip fixed 2015-11-20 16:41:27 +01:00
Dhanya Maliakal
c097dfc8b3 two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc 2015-11-20 16:28:48 +01:00
Dhanya Maliakal
a1bd54b16b pulsing in client and server 2015-11-19 17:43:46 +01:00
Dhanya Maliakal
e0464ef782 pulsing client side, and bug fix server side for reset partially 2015-11-19 16:15:59 +01:00
Dhanya Maliakal
291fe8bc22 socket disconnecting in receiver 2015-11-19 11:10:59 +01:00