Dhanya Maliakal
|
1881cb0010
|
updated binaries
|
2017-10-27 16:07:42 +02:00 |
|
Dhanya Maliakal
|
1420921291
|
Merge branch '3.0' into 3.0.1
|
2017-10-27 15:47:15 +02:00 |
|
Dhanya Maliakal
|
aab56ea943
|
updated jungfrau server binary
|
2017-10-27 15:39:55 +02:00 |
|
Dhanya Maliakal
|
045a7cfcb1
|
removed settings bug, highvoltage returning 60 when switched off
|
2017-10-27 15:38:07 +02:00 |
|
Dhanya Maliakal
|
92f988ddc1
|
somewhere
|
2017-10-27 14:00:57 +02:00 |
|
Dhanya Maliakal
|
79bce5e006
|
4 bit mode works without gappixels
|
2017-10-26 16:01:18 +02:00 |
|
Dhanya Maliakal
|
9c82a8f726
|
temp in between, trying to get 4 bitmode to work without gap pixels
|
2017-10-26 11:19:58 +02:00 |
|
Dhanya Maliakal
|
6812961836
|
temp in between, trying to get 4 bitmode to work without gap pixels
|
2017-10-26 11:09:55 +02:00 |
|
Dhanya Maliakal
|
003239cddd
|
gap pixels for 4 bit mode restrictions, not completed
|
2017-10-24 14:16:08 +02:00 |
|
Dhanya Maliakal
|
ce7386e230
|
merge solved from developer, xcoord from detector if given
|
2017-10-23 17:21:45 +02:00 |
|
Dhanya Maliakal
|
fde4194f9b
|
merged with developer, receiver call back merged with no call back
|
2017-10-23 17:12:00 +02:00 |
|
Dhanya Maliakal
|
7f9ac86862
|
Merge branch 'developer' into gappixels
|
2017-10-23 17:09:13 +02:00 |
|
Dhanya Maliakal
|
16a939c0c0
|
Merge branch '3.0.1' into developer
|
2017-10-23 17:08:12 +02:00 |
|
Dhanya Maliakal
|
f4f03f659a
|
color code in user example depending on modID, instead of xcoord
|
2017-10-23 17:07:45 +02:00 |
|
Dhanya Maliakal
|
4084e2c31e
|
updated release doc
|
2017-10-23 17:06:12 +02:00 |
|
Dhanya Maliakal
|
e417885459
|
merge conflict in release, merged incorporating no call back and call back into one user example
|
2017-10-23 15:30:00 +02:00 |
|
Dhanya Maliakal
|
65fd5a3057
|
merged without call back and call back into one user example
|
2017-10-23 15:26:04 +02:00 |
|
Dhanya Maliakal
|
1f138abac1
|
fix in receiver as x, y and z are properly integrated with detector server for eiger and jungfrau, and handling previous versions of detector where x y and z were all 0 (hardcoding them in 1 d)
|
2017-10-23 12:21:41 +02:00 |
|
Dhanya Maliakal
|
d2fd0cbee9
|
x y and z coordinates are pushed into eiger server and its fixed in appropriate client side as well
|
2017-10-23 12:20:18 +02:00 |
|
Dhanya Maliakal
|
210bcb081d
|
xcoord should not be hardcoded for this version for eiger and jungfrau
|
2017-10-20 10:49:02 +02:00 |
|
Dhanya Maliakal
|
387b4ef457
|
updated release with patches notes
|
2017-10-19 17:09:50 +02:00 |
|
Dhanya Maliakal
|
673b7f1652
|
merge conflict fixed with developer
|
2017-10-19 15:36:28 +02:00 |
|
Dhanya Maliakal
|
b6ae3300a9
|
merge conflict fixed with developer(patches for file write disable, xcoord)
|
2017-10-19 15:35:34 +02:00 |
|
Dhanya Maliakal
|
c755a5b602
|
bug fix to release.txt from the merge
|
2017-10-19 14:41:46 +02:00 |
|
Dhanya Maliakal
|
801817b749
|
bug fix to the merge
|
2017-10-19 14:41:12 +02:00 |
|
Dhanya Maliakal
|
1cddb9a542
|
merge from 3.0.1 with patches for file write disable
|
2017-10-18 17:53:55 +02:00 |
|
Dhanya Maliakal
|
72b71cd680
|
merge from 3.0 hotfixes done
|
2017-10-18 17:39:19 +02:00 |
|
Dhanya Maliakal
|
5388b54eff
|
updaterev
|
2017-10-18 15:52:08 +02:00 |
|
Dhanya Maliakal
|
75b94e6614
|
fixed file write enable bug from the last patch
|
2017-10-18 12:29:46 +02:00 |
|
Dhanya Maliakal
|
4aa0c8e24e
|
Merge branch '3.0.1' of git.psi.ch:sls_detectors_software/sls_detectors_package into 3.0.1
|
2017-10-17 12:14:40 +02:00 |
|
|
|
927e776353
|
Merge branch 'developer' into gappixels
|
2017-10-12 15:09:35 +02:00 |
|
|
|
36a200ceba
|
Merge branch 'developer' into gappixels
|
2017-10-12 15:09:30 +02:00 |
|
|
|
0fe43c75f2
|
merge branch developer into gappixels, added .project into gitignore
|
2017-10-12 15:08:32 +02:00 |
|
|
|
4d92744dea
|
.project added to gitignore
|
2017-10-12 15:08:12 +02:00 |
|
|
|
ae72df7b14
|
.project added to gitignore
|
2017-10-12 15:07:54 +02:00 |
|
|
|
e814aee300
|
.project added to gitignore
|
2017-10-12 15:07:33 +02:00 |
|
|
|
4f2af046d3
|
Merge branch 'developer' into gappixels
|
2017-10-12 14:58:41 +02:00 |
|
|
|
91588ecc21
|
Merge branch 'developer' into gappixels
|
2017-10-12 14:58:25 +02:00 |
|
Dhanya Maliakal
|
d2767afa7c
|
added the eiger server binary with merges from 3.0.1
|
2017-10-12 14:57:12 +02:00 |
|
|
|
311059d748
|
merge fix from 3.0.1 which includes server without crash, multi settimer -1 bug, need to recompile eiger server for this branch
|
2017-10-12 14:42:57 +02:00 |
|
Gemma Tinti
|
40cb2993fb
|
eiger manual
|
2017-10-12 12:15:43 +02:00 |
|
Dhanya Maliakal
|
fe6e1c8868
|
new eiger server binary with status fixed
|
2017-10-12 11:48:43 +02:00 |
|
Dhanya Maliakal
|
eb78ae0fe1
|
new eiger server binary with status fixed
|
2017-10-12 11:44:46 +02:00 |
|
|
|
8585a536ec
|
fixed eiger server status problem, updating binary in next commit
|
2017-10-12 11:42:37 +02:00 |
|
|
|
338fb2af35
|
in betwee, fixed eiger server error
|
2017-10-12 11:38:26 +02:00 |
|
|
|
a6e520d969
|
in between stage: error in compiling eiger server with error status: include file
|
2017-10-12 11:35:31 +02:00 |
|
|
|
eb32335194
|
trying changes to server for error
|
2017-10-12 10:51:47 +02:00 |
|
|
|
10e57319bf
|
moench03OnTheFlyAnalysis multipthreaded with interpolation works
|
2017-10-12 10:31:11 +02:00 |
|
|
|
a59309b13f
|
minor bug fix if same client: client ip only 8 bytes instead of 16 bytes copied, added user class functionality for long term use:stopacquisition
|
2017-10-12 10:18:15 +02:00 |
|
|
|
f2f061ae18
|
bug fix: using int instead of int64_t , eg exptime is -1 on return
|
2017-10-12 09:47:13 +02:00 |
|
