 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 |
|
 maliakal_d
|
927e776353
|
Merge branch 'developer' into gappixels
|
2017-10-12 15:09:35 +02:00 |
|
|
maliakal_d
|
36a200ceba
|
Merge branch 'developer' into gappixels
|
2017-10-12 15:09:30 +02:00 |
|
|
maliakal_d
|
0fe43c75f2
|
merge branch developer into gappixels, added .project into gitignore
|
2017-10-12 15:08:32 +02:00 |
|
|
maliakal_d
|
4d92744dea
|
.project added to gitignore
|
2017-10-12 15:08:12 +02:00 |
|
|
maliakal_d
|
ae72df7b14
|
.project added to gitignore
|
2017-10-12 15:07:54 +02:00 |
|
|
maliakal_d
|
e814aee300
|
.project added to gitignore
|
2017-10-12 15:07:33 +02:00 |
|
|
maliakal_d
|
4f2af046d3
|
Merge branch 'developer' into gappixels
|
2017-10-12 14:58:41 +02:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
8585a536ec
|
fixed eiger server status problem, updating binary in next commit
|
2017-10-12 11:42:37 +02:00 |
|
|
maliakal_d
|
338fb2af35
|
in betwee, fixed eiger server error
|
2017-10-12 11:38:26 +02:00 |
|
|
maliakal_d
|
a6e520d969
|
in between stage: error in compiling eiger server with error status: include file
|
2017-10-12 11:35:31 +02:00 |
|
|
maliakal_d
|
eb32335194
|
trying changes to server for error
|
2017-10-12 10:51:47 +02:00 |
|
 bergamaschi
|
10e57319bf
|
moench03OnTheFlyAnalysis multipthreaded with interpolation works
|
2017-10-12 10:31:11 +02:00 |
|
|
maliakal_d
|
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 |
|
|
maliakal_d
|
f2f061ae18
|
bug fix: using int instead of int64_t , eg exptime is -1 on return
|
2017-10-12 09:47:13 +02:00 |
|
|
maliakal_d
|
d30a839eff
|
file writer class should be created only if file write enabled, x coord fixed to reflect hardcoded values as detector does not send this value yet
|
2017-10-10 16:54:50 +02:00 |
|
|
Dhanya Maliakal
|
948eb455e2
|
editing release text, in between, need to still fix eiger server with new eror status functionality
|
2017-10-10 12:15:04 +02:00 |
|
|
Dhanya Maliakal
|
44bf4c52ed
|
changes for eiger server to return error if error
|
2017-10-06 13:48:06 +02:00 |
|
|
Dhanya Maliakal
|
2e5f64d9bc
|
gap pixels for 8, 16, 32 in receiver at udp level
|
2017-10-05 15:59:07 +02:00 |
|
|
Dhanya Maliakal
|
0d92b11055
|
print out comment, not print if mythen else access to null
|
2017-10-05 15:58:37 +02:00 |
|
|
Dhanya Maliakal
|
4260dc0baf
|
conflict resolution
|
2017-10-03 15:18:56 +02:00 |
|
|
Dhanya Maliakal
|
0f302e3446
|
conflict resolution
|
2017-10-03 15:17:15 +02:00 |
|
|
Dhanya Maliakal
|
e54767b69d
|
conflict resolution with developer
|
2017-10-03 15:12:56 +02:00 |
|
|
Dhanya Maliakal
|
812606a7b4
|
conflict resolution with developer
|
2017-10-03 15:12:49 +02:00 |
|
|
Dhanya Maliakal
|
fc025bd28b
|
conflict resolution with developer
|
2017-10-03 15:12:35 +02:00 |
|
|
Dhanya Maliakal
|
34f10b382e
|
one more conflict resolved from mergin with 3.0.1 (silent mode, this had changes for zmq source ip)
|
2017-10-03 15:01:30 +02:00 |
|
|
Dhanya Maliakal
|
0b82aabd2b
|
merge with 3.0.1 conflicts resolved
|
2017-10-03 14:52:53 +02:00 |
|
|
Dhanya Maliakal
|
03a2f979a9
|
fixing merge conflict in error_Defs
|
2017-10-03 14:32:30 +02:00 |
|
|
Dhanya Maliakal
|
2aed12dcb9
|
updaterev
|
2017-10-03 14:18:33 +02:00 |
|
|
Dhanya Maliakal
|
96caf728c8
|
setting receiver to none properly, ten giga set in shared memoery properly if no receiver involved
|
2017-10-03 14:17:48 +02:00 |
|
|
Dhanya Maliakal
|
4669d408d4
|
somewhere in between
|
2017-10-03 12:09:31 +02:00 |
|
|
Dhanya Maliakal
|
c594870fdd
|
Merge branch 'realgappixels' into gappixels
|
2017-10-03 10:49:47 +02:00 |
|
|
Dhanya Maliakal
|
34062b6e0b
|
fixed 32 bit gui masking problem in qdrawplot (conversion from char* to double) mythen clause not activated
|
2017-10-03 10:49:26 +02:00 |
|
|
Dhanya Maliakal
|
7cde5dbe38
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:08 +02:00 |
|
|
Dhanya Maliakal
|
bb817733ff
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:05 +02:00 |
|