Maliakal Dhanya
|
255f9e3fee
|
eiger: trimbits changed such that it works for multi modules, ;general: loading multislsdetectr list with y dir first, updating the readframefromreceiver to load all the data interswapped for 16 bit; nthframe works better
|
2014-12-11 14:16:43 +01:00 |
|
Maliakal Dhanya
|
193c62dc42
|
updating version numbers
|
2014-12-08 10:20:09 +01:00 |
|
Maliakal Dhanya
|
08a1034f63
|
back to only top gettgn acquisition
|
2014-12-08 10:16:31 +01:00 |
|
Maliakal Dhanya
|
0184970ef9
|
default dac values for eiger
|
2014-12-04 16:16:06 +01:00 |
|
Gemma Tinti
|
294a8a3098
|
no change
|
2014-12-04 11:20:15 +01:00 |
|
Maliakal Dhanya
|
d76200e68d
|
bottom allowed
|
2014-12-04 10:49:15 +01:00 |
|
|
|
94a73ecd45
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-12-03 10:23:25 +01:00 |
|
|
|
8eea6f1d83
|
Mofifications to jungfrau server and pattern generator
|
2014-12-03 10:23:05 +01:00 |
|
Maliakal Dhanya
|
8dd7772bfe
|
stop server automatic for gemma
|
2014-12-02 16:12:45 +01:00 |
|
Maliakal Dhanya
|
28b7a73b13
|
working version for eiger detector before branching to gemma
|
2014-12-01 17:15:31 +01:00 |
|
Maliakal Dhanya
|
f79f8558f0
|
mostly to do with better testing methods in eiger server and separating acquisition, inclding start receiver etc
|
2014-11-28 14:26:47 +01:00 |
|
Maliakal Dhanya
|
4649de2742
|
some changes for better testing in eiger server, including using set receiver, and changed to top/bottom instead of master slave
|
2014-11-28 14:26:19 +01:00 |
|
|
|
9ad65bc374
|
First commit
|
2014-11-27 09:30:14 +01:00 |
|
|
|
5fe8c6e457
|
multiSlsDetector merging fixed
|
2014-11-25 12:00:08 +01:00 |
|
|
|
91344f54d9
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
Conflicts:
multiSlsDetector/multiSlsDetector.cpp
|
2014-11-25 11:46:34 +01:00 |
|
|
|
d10335e4a9
|
pattern generator produces binary file as well; adc clock frequency can be changed as well as run clock frequency
|
2014-11-25 11:38:19 +01:00 |
|
|
|
3921dc2bf8
|
added DEBUG flags
added REST, DEBUG description in make help
|
2014-11-18 10:50:38 +01:00 |
|
Maliakal Dhanya
|
ceb2d28281
|
symbolic link corrected to point ot correct location
|
2014-11-17 17:00:38 +01:00 |
|
Maliakal Dhanya
|
3548ca5750
|
symbolic link corrected to point ot correct location
|
2014-11-17 16:57:54 +01:00 |
|
|
|
9a43fb4082
|
put REST=no as default
|
2014-11-17 15:59:11 +01:00 |
|
|
|
02ab7a4ed0
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-11-17 15:00:32 +01:00 |
|
|
|
769f9b7e76
|
Merge branch 'master' into eiger_receiver
|
2014-11-17 14:59:41 +01:00 |
|
Maliakal Dhanya
|
cc6ee10e10
|
added a temp eiger setup file in settingsdir
|
2014-11-17 14:48:35 +01:00 |
|
Maliakal Dhanya
|
194b41bfc5
|
changes to get index in eiger server
|
2014-11-17 14:46:28 +01:00 |
|
Maliakal Dhanya
|
b24f374155
|
setting number of frames had a bug in eiger server, refactored code a bit
|
2014-10-20 17:33:22 +02:00 |
|
Maliakal Dhanya
|
dd8f48929c
|
the version given to esrf
|
2014-10-16 14:14:00 +02:00 |
|
Maliakal Dhanya
|
5a5372350f
|
stop server incl in makefile, master chosen based on top or bottom module at the moment
|
2014-10-16 13:49:56 +02:00 |
|
|
|
327c2106df
|
Some fixes for the CTB
|
2014-10-14 17:43:25 +02:00 |
|
|
|
74ef04e726
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-10-14 17:03:50 +02:00 |
|
|
|
308b3aa9b1
|
Client and jungfrau server funcs added for pattern generator
|
2014-10-14 17:03:13 +02:00 |
|
Maliakal Dhanya
|
0896fb137f
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-10-14 15:39:11 +02:00 |
|
Maliakal Dhanya
|
bbf26927dd
|
full module server works now, slave and master yet to be done
|
2014-10-14 15:38:45 +02:00 |
|
Maliakal Dhanya
|
347a36b7c1
|
module acquisition works, edit getrunstatus, added a small code for master incomplete, adjusted server to look for element in position 1 instead of zero
|
2014-10-06 11:01:51 +02:00 |
|
Maliakal Dhanya
|
1679977cad
|
some eiger setup file changes
|
2014-10-06 10:56:01 +02:00 |
|
|
|
2d66e1f731
|
Added pattern generator - must still implement client-server commands
|
2014-10-03 10:43:12 +02:00 |
|
|
|
18188cd095
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-10-01 10:39:23 +02:00 |
|
|
|
fec9a30e6a
|
Added jungfrau detector server (not functional, though)
|
2014-10-01 10:38:47 +02:00 |
|
Maliakal Dhanya
|
d8c7201749
|
module udpport2
|
2014-09-26 11:18:59 +02:00 |
|
Maliakal Dhanya
|
fa6ab0b324
|
usleep added for 32 bit mode and debug statements for eiger server
|
2014-09-16 16:31:51 +02:00 |
|
|
|
4971e26d7b
|
modified Makefiles to support REST interface
|
2014-09-15 16:51:59 +02:00 |
|
|
|
03b04bca74
|
Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_detectors_package into eiger_receiver
Conflicts:
Makefile
|
2014-09-12 16:18:34 +02:00 |
|
|
|
388f96c046
|
Makefile updates
|
2014-09-12 16:16:10 +02:00 |
|
|
|
81132f4d78
|
updating Makefile
|
2014-09-12 13:47:05 +02:00 |
|
|
|
102f9a2d05
|
updating Makefile
|
2014-09-12 13:46:48 +02:00 |
|
Maliakal Dhanya
|
62464441ee
|
vtrimbit size and vthreshold common for eiger
|
2014-09-09 17:00:26 +02:00 |
|
Maliakal Dhanya
|
205fc06200
|
trimbits work.
|
2014-09-09 15:43:18 +02:00 |
|
Maliakal Dhanya
|
7faac70c3f
|
trimbits work.
|
2014-09-09 15:42:16 +02:00 |
|
Maliakal Dhanya
|
c5a4f357bf
|
got rid of extra servers for eiger, converted to c and it works
|
2014-08-29 16:41:19 +02:00 |
|
Maliakal Dhanya
|
10ca7c10e8
|
got rid of extra servers for eiger, converted to c and it works
|
2014-08-29 16:40:27 +02:00 |
|
Maliakal Dhanya
|
367bdd9c2f
|
no change
|
2014-08-08 14:03:30 +02:00 |
|
