Commit Graph

170 Commits

Author SHA1 Message Date
c097dfc8b3 two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc 2015-11-20 16:28:48 +01:00
a1bd54b16b pulsing in client and server 2015-11-19 17:43:46 +01:00
e0464ef782 pulsing client side, and bug fix server side for reset partially 2015-11-19 16:15:59 +01:00
8b0895add0 reset counter bit in eiger detector partially or completely 2015-11-17 16:39:36 +01:00
11dafc6ebf resetting frame number done after resetting detector (prepareforacquisition) eiger server 2015-11-17 15:28:47 +01:00
bc55f9d1e4 edited getdatafromdetector to not stop detector for eiger 2015-11-17 12:00:42 +01:00
66db11421f implemented fifo depth configurable from client 2015-11-17 10:30:53 +01:00
c43af96487 some changes refactoring and reducing time spent 2015-11-13 17:47:44 +01:00
ab9e01f212 usleep in detector taken off 2015-11-12 15:30:56 +01:00
816543f358 detector ip for eiger is replaced by hardware ip for 1g 2015-11-06 11:10:51 +01:00
bc6dfca552 ensuring vthreshold returns the right value 2015-11-03 15:22:57 +01:00
2e701168b9 forgot to add eiger server 2015-11-02 12:32:56 +01:00
2152eb1d28 detector id returns a number form a file or 0 if no file: eiger 2015-11-02 12:31:19 +01:00
8ffdcb08c9 fixed the set trimbit getting stuck bug. was due to gain and offset not sent properly for eiger 2015-10-15 16:00:09 +02:00
6ab7947b97 fixed the gain and offset default values uploaded for eiger 2015-10-14 10:47:43 +02:00
25dbaa4e09 fixed the gain and offset default values uploaded for eiger 2015-10-14 10:38:39 +02:00
8972fa1143 EigerDetectorServer for firmware version 11, changes: direct write into udp block ram 2015-10-08 17:29:13 +02:00
271838b2b5 changes to includes clkdivider and flags in gui and modify the server for proper checks 2015-09-10 11:29:15 +02:00
584b9e6036 added gain and offsets to the shared memory, that are sent along with sls_detector_module, only for eiger 2015-09-04 15:54:12 +02:00
7f168e3a70 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-09-03 15:40:11 +02:00
681ed0f34f added function to read 4 energy calibration coefficients for eiger, comments on how to add them to the software 2015-09-03 15:39:54 +02:00
cae286941a added subframe exposure time settable 2015-09-03 15:16:48 +02:00
95324fc929 resets footer frame numbers 2015-09-02 11:06:07 +02:00
c9a952a748 changing file name prefix orders, reset frames caught command from command line 2015-08-19 11:38:09 +02:00
0d83346943 continuous and storeinram variable 2015-07-24 09:21:38 +02:00
5f0741d882 trimbits flipped and works correctly for top and bottom 2015-07-01 15:00:17 +02:00
a3a2db1f73 fixed 32 progress problem, and increased debugging 2015-06-30 17:20:23 +02:00
f29f9b701d check detector mac matches hardware mac only for 1Gbe 2015-06-30 12:28:44 +02:00
8202e4aa0a git rev in 2015-06-29 16:56:34 +02:00
f3d5de70bf firmware version for eiger added 2015-06-22 17:09:47 +02:00
861753a5d1 formatted changes made by Martin, which inclded resolving fifo full problem, first frame problem; 32 bit mode sub frame and 16 byte ignore 2015-06-16 11:59:07 +02:00
8323f81e8a beb includes read, write functions, so that it doesnt have to go to locallink interface 2015-06-15 17:41:48 +02:00
b11b7c1c09 beb stop acquisiion return, some minor changes, increased the check time for receiver frame after detector read out done using acquisiingDone variable 2015-06-12 17:45:43 +02:00
b193237df3 Making eigerDetectorServer running with the new firmware (request frames/packets is now done in HW) 2015-06-11 11:19:51 +02:00
c0dac6fd27 receiver can return fail for a get and a message 2015-05-26 17:00:07 +02:00
ee4fa791be interleaving request messages to different ports of eiger detector 2015-05-26 12:07:43 +02:00
302d9ca0ed added the code for toggle bit to know when acquisition started in febcontrol and list, indentation as well 2015-05-20 12:01:49 +02:00
1f1581a1fa no_serial was merged to master 2015-05-13 14:41:25 +02:00
9f8ed3a4b5 Added more debug messages for DMARTIN flag 2015-04-28 17:19:04 +02:00
7f7e7ca727 Fixed serial assignment. If top=1, serial=0 and vice versa. 2015-04-21 11:57:31 +02:00
8a8e1b7130 Remove -DMARTIN as default flag 2015-04-21 11:11:32 +02:00
399ae4e669 Added colors for MARTIN debug prints 2015-04-20 18:22:29 +02:00
39cd82f0b8 Added Backend board FPGA temperature support 2015-04-20 18:20:02 +02:00
8f4c2001ae warning fixed 2015-04-15 14:49:06 +02:00
ee0c6c4a05 1 sec usleep to stop receiver for eiger 2015-03-31 15:00:57 +02:00
9d3a171a28 1 sec usleep to stop receiver for eiger 2015-03-31 14:59:26 +02:00
031ccdf070 change to server for no serial to work 2015-03-30 15:36:55 +02:00
1ad0bc56e7 included slsDetectorUsers 2015-03-25 15:26:38 +01:00
477b2fb467 acquire works properly now 2015-03-12 16:47:20 +01:00
7e44648da9 different between acquisition index and frame index 2015-03-12 12:22:19 +01:00