|
|
769f9b7e76
|
Merge branch 'master' into eiger_receiver
|
2014-11-17 14:59:41 +01:00 |
|
|
|
cc6ee10e10
|
added a temp eiger setup file in settingsdir
|
2014-11-17 14:48:35 +01:00 |
|
|
|
194b41bfc5
|
changes to get index in eiger server
|
2014-11-17 14:46:28 +01:00 |
|
|
|
b24f374155
|
setting number of frames had a bug in eiger server, refactored code a bit
|
2014-10-20 17:33:22 +02:00 |
|
|
|
dd8f48929c
|
the version given to esrf
|
2014-10-16 14:14:00 +02:00 |
|
|
|
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 |
|
|
|
0896fb137f
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-10-14 15:39:11 +02:00 |
|
|
|
bbf26927dd
|
full module server works now, slave and master yet to be done
|
2014-10-14 15:38:45 +02:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
d8c7201749
|
module udpport2
|
2014-09-26 11:18:59 +02:00 |
|
|
|
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 |
|
|
|
62464441ee
|
vtrimbit size and vthreshold common for eiger
|
2014-09-09 17:00:26 +02:00 |
|
|
|
205fc06200
|
trimbits work.
|
2014-09-09 15:43:18 +02:00 |
|
|
|
7faac70c3f
|
trimbits work.
|
2014-09-09 15:42:16 +02:00 |
|
|
|
c5a4f357bf
|
got rid of extra servers for eiger, converted to c and it works
|
2014-08-29 16:41:19 +02:00 |
|
|
|
10ca7c10e8
|
got rid of extra servers for eiger, converted to c and it works
|
2014-08-29 16:40:27 +02:00 |
|
|
|
367bdd9c2f
|
no change
|
2014-08-08 14:03:30 +02:00 |
|
|
|
b50da5b198
|
updated makefile for eiger receiver
|
2014-08-05 11:05:24 +02:00 |
|
|
|
56da3f42cc
|
trimbits not working yet, nth frame works for eiger, scans work for eiger
|
2014-07-31 12:11:33 +02:00 |
|
|
|
7e46a407c6
|
added trimval function, but sending trimbits from char to int bug
|
2014-07-21 16:39:36 +02:00 |
|
|
|
e15d6077df
|
small changes with trimbits
|
2014-07-18 17:38:39 +02:00 |
|
|
|
c4f8c4a2aa
|
set_dac function updated for mythen and gotthard as well
|
2014-07-18 10:29:27 +02:00 |
|
|
|
e53058640b
|
Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software
|
2014-07-18 09:40:11 +02:00 |
|
|
|
8cee0a7332
|
implemented setModule, setTrimbits function
|
2014-07-18 09:39:27 +02:00 |
|
|
|
95947778c5
|
tried some stuff with ifg
|
2014-07-16 15:09:26 +02:00 |
|
|
|
024e386f50
|
gotthard executable has mv in server
|
2014-07-16 10:48:07 +02:00 |
|
|
|
5e6153af9e
|
fixed bug mv in dacs for command line
|
2014-07-16 10:45:35 +02:00 |
|
|
|
fd6bf1d34b
|
added slsdetectorcalibration to gitignore
|
2014-07-16 10:44:53 +02:00 |
|
|
|
8b119f58ee
|
switching master branch with separate_receiver branch
Merge branch 'master' into separate_receiver
|
2014-07-14 14:28:36 +02:00 |
|
|
|
b388d08dbe
|
eiger dac settings
|
2014-07-11 16:59:09 +02:00 |
|
|
|
828a2dbd17
|
10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file
|
2014-07-11 13:06:48 +02:00 |
|
|
|
e11da6fd5b
|
eiger dac files updated with dac units instead of mV
|
2014-07-11 12:51:42 +02:00 |
|
|
|
018b800117
|
eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working
|
2014-07-02 10:55:32 +02:00 |
|
|
|
b29879511b
|
get status works in eiger server
|
2014-06-18 16:37:35 +02:00 |
|
|
|
cf52d85f73
|
getdata from commandline was getting stuck:fixed,eiger server remembers frame and exptime period cuz getstatus doesn work for now, request images, added setting image number in eigerserver, packetsize fixed in eigerserver
|
2014-06-16 17:00:21 +02:00 |
|
|
|
73ba765647
|
git version history
|
2014-06-03 13:55:41 +02:00 |
|
|
|
35035405a0
|
git version history
|
2014-06-03 12:26:45 +02:00 |
|
|
|
3d9071a0bb
|
git version history
|
2014-06-03 12:03:37 +02:00 |
|
