7471 Commits

Author SHA1 Message Date
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
5afb38c1ec changing the print outs 2016-02-08 10:40:33 +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
0c9806e17f jungfrau header changed 2016-02-04 12:39:05 +01:00
Dhanya Maliakal
41f7743af9 included fifodepth for jungfrau. Needed else its stuck 2016-02-03 16:27:23 +01:00
Dhanya Maliakal
6cc22a350d Merge branch 'release' into jungfrauv1.0 2016-02-03 15:05:50 +01:00
Dhanya Maliakal
615909f178 Merge branch 'release' into jungfrauv1.0 2016-02-03 15:00:53 +01:00
Dhanya Maliakal
e3d9fd1c02 Merge branch 'release' into jungfrauv1.0 2016-02-03 14:59:22 +01:00
Dhanya Maliakal
c217cb0978 merging with release 2016-02-03 14:58:32 +01:00
Dhanya Maliakal
ef8fbab1f4 10g bug fixed in previous branch merge 2016-02-03 11:34:47 +01:00
Dhanya Maliakal
fed17eb8eb modified color of printout 2016-02-03 11:26:18 +01:00
Dhanya Maliakal
72cfd7a1d7 all changes done with bugs solved. need to test with image reconstruction 2016-02-02 18:57:20 +01:00
Dhanya Maliakal
f19031a736 all changes done 2016-02-02 18:52:24 +01:00
Dhanya Maliakal
3045876a86 solved bug problem 2016-02-02 17:33:57 +01:00
Dhanya Maliakal
8ca9157882 corrected checkout script 2016-02-02 11:37:40 +01:00
Dhanya Maliakal
1230b63b29 Merge branch 'release', remote branch 'origin' into release 2016-02-02 11:21:07 +01:00
Dhanya Maliakal
316ecf1b50 no change check 2016-02-02 11:10:49 +01:00
Dhanya Maliakal
d0a38d203d Merge branch 'release' of git.psi.ch:sls_detectors_software/sls_detectors_package into release 2016-02-02 10:50:25 +01:00
d489b34824 Test commit, added a space in makefile 2016-02-02 10:49:40 +01:00
Dhanya Maliakal
b27e42f193 Merge branch 'release', remote branch 'origin' into release 2016-02-02 10:48:15 +01:00
Dhanya Maliakal
0ce03226ee changed the checkout script to point to new remote repo 2016-02-02 10:42:59 +01:00
Dhanya Maliakal
39c3a712e1 solved a bit, but not the create fiel problem 2016-02-01 17:57:43 +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
Dhanya Maliakal
deb72feb91 still not resolved altho some changes 2016-01-19 14:39:58 +01:00
Gemma Tinti
1477f67c4c eiger documentation 2016-01-15 14:39:02 +01:00
Gemma Tinti
a785eb7d5e newline after wrong command 2016-01-08 17:18:50 +01:00
Gemma Tinti
22cb739c7f start to update manuals for Eiger 2016-01-08 17:13:48 +01:00
09807aae49 Added slsReceiverScript and xterms 2015-12-16 16:14:18 +01:00
Dhanya Maliakal
5c239ad45f data call back form receiver includes both x and y dimensions 2015-12-16 15:01:00 +01:00
ff7a2d5185 Added slsReceiverScript and xterms 2015-12-15 16:31:18 +01:00
Wang Xiaoqiang
06e810169d Revert "trying to fix for 2D detector(eiger)"
This reverts commit 0a471f54edffb54a9871bbc8ebb241c22775451c.
2015-12-15 16:29:47 +01:00
Wang Xiaoqiang
54c1765f34 Revert "Revert "pulse chip fixed""
This reverts commit 356e6cb8cacec52ec6883e625a6b3639633f3b0e.
2015-12-15 16:29:35 +01:00
Wang Xiaoqiang
ca6f2b8588 Revert "pulse chip fixed"
This reverts commit f85739e8b64a3b0c7af02d068a2cc429064ad103.
2015-12-15 16:26:44 +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
bb78d1af73 solved recover from root permission error 2015-12-15 11:59:17 +01:00
Dhanya Maliakal
18eb1274c5 fixed fifodepth to return defualt size, also moved destroying and creating threads to fifostructure, had forgotten to override setnumberofframes calling fifostructure which is important for gotthard 2015-12-15 11:04:49 +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
Wang Xiaoqiang
4fc8065ef5 trying to fix for 2D detector(eiger) 2015-12-08 13:26:17 +01:00