7471 Commits

Author SHA1 Message Date
Dhanya Maliakal
f29f9b701d check detector mac matches hardware mac only for 1Gbe 2015-06-30 12:28:44 +02:00
Dhanya Maliakal
c4e0f2967f solved detector organisation in client side 2015-06-30 11:54:13 +02:00
Dhanya Maliakal
3600fb6304 git rev in 2015-06-29 16:57:16 +02:00
Dhanya Maliakal
8202e4aa0a git rev in 2015-06-29 16:56:34 +02:00
Dhanya Maliakal
a5e18833de git rev in 2015-06-29 16:55:51 +02:00
Dhanya Maliakal
4ebc9dffac git rev in 2015-06-29 16:55:26 +02:00
Dhanya Maliakal
ceba5b8331 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration 2015-06-29 16:53:37 +02:00
Dhanya Maliakal
51bd146178 flip bytes incorporated 2015-06-29 16:52:52 +02:00
90340d76b4 lookup table for the IR intensity 2015-06-26 16:55:38 +02:00
2a719390cb adding script for gifs 2015-06-26 16:32:10 +02:00
Dhanya Maliakal
7e02a9d3d1 resolved flip bytes in eiger 2015-06-26 15:57:28 +02:00
Dhanya Maliakal
47d51674b4 resolved flip bytes in eiger 2015-06-26 15:57:10 +02:00
Dhanya Maliakal
49ef6659d4 eiger dynamic range offline header, moved eiger specific stuff from slsDetectorData to eigerHalfmodule 2015-06-26 15:45:38 +02:00
Dhanya Maliakal
1f9f474670 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration 2015-06-26 11:53:01 +02:00
Dhanya Maliakal
9041c48bbf offline headers for dynamic range, fixed port to be same 1 bit always 2015-06-26 11:52:17 +02:00
Dhanya Maliakal
237c5286ca includes dynamic range in offline headers for eiger 2015-06-26 11:49:26 +02:00
b820ae0cad checkFrameNumber added to moench03 read data 2015-06-23 11:03:49 +02:00
92e1029fec Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration 2015-06-23 09:15:46 +02:00
1941ecb3c3 Adedde sturctures for moench03 10Gb data 2015-06-23 09:15:23 +02:00
Dhanya Maliakal
f3d5de70bf firmware version for eiger added 2015-06-22 17:09:47 +02:00
23a21b373e modified readMoench03 by Marco 2015-06-18 14:16:43 +02:00
Gemma Tinti
e16cda9509 fix a typo and makefile 2015-06-17 17:30:41 +02:00
Dhanya Maliakal
aa94f2f7be write headers is compulsory for eiger and shouldnt be in makefile 2015-06-16 16:28:53 +02:00
Dhanya Maliakal
8b282e3bbe write headers is compulsory for eiger 2015-06-16 16:28:24 +02:00
Dhanya Maliakal
9a61841ac7 git version update 2015-06-16 12:00:02 +02:00
Dhanya Maliakal
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
Dhanya Maliakal
7b2934fb73 git version update 2015-06-16 11:56:58 +02:00
Dhanya Maliakal
8323f81e8a beb includes read, write functions, so that it doesnt have to go to locallink interface 2015-06-15 17:41:48 +02:00
Dhanya Maliakal
bcf8d40fd2 minor changes, but posted semaphore in stop receiver so rxr not waiting forever for gui when it will never come 2015-06-12 17:46:50 +02:00
Dhanya Maliakal
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
Dhanya Maliakal
e035eeaf08 not compulsory anymore for every frame for eiger 2015-06-12 17:44:30 +02:00
2b05ceb281 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2015-06-12 13:00:21 +02:00
de0f35afb3 some jctb changes 2015-06-12 13:00:13 +02:00
Dhanya Maliakal
d69c6df9ce 32 bit mode image reconstuction should work for frame numbers as well 2015-06-11 13:33:18 +02:00
Dhanya Maliakal
67628c74e1 removed all the scripts for just gitall 2015-06-11 12:35:53 +02:00
Dhanya Maliakal
aa29f12bb8 removed all the scripts for just gitall 2015-06-11 12:34:44 +02:00
Dhanya Maliakal
13b35b319c removed all the scripts for just gitall 2015-06-11 12:34:15 +02:00
Dhanya Maliakal
aca95703a9 tiny changes 2015-06-11 11:42:44 +02:00
Dhanya Maliakal
a4de9a914a added a function to give frame number while reading next frame 2015-06-11 11:38:10 +02:00
b27f691d03 Revert "Solved merge conflicts"
This reverts commit c222221d18bd5db7d9a8c86071fe2fbdc0ce25ac.
2015-06-11 11:30:40 +02:00
28ed7d6b2d Solved merge conflicts 2015-06-11 11:25:49 +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
Dhanya Maliakal
fdaca88225 includes 32 bit subframes 2015-06-10 13:26:51 +02:00
Dhanya Maliakal
849d0de5cb not much valuable change 2015-06-10 12:23:38 +02:00
Dhanya Maliakal
7046d2ad6e fixed merge 2015-05-28 14:46:46 +02:00
cartier_s
88ec090ee6 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration
Conflicts:
	slsDetectorData.h
2015-05-28 14:29:45 +02:00
cartier_s
7e8cf810fb main in moenchReadDataMT [multi threading] 2015-05-28 14:28:17 +02:00
Dhanya Maliakal
4f88e831c4 checks if receiver udp object was created before executing functions and hence always returns a ret 2015-05-26 17:01:42 +02:00
Dhanya Maliakal
c0dac6fd27 receiver can return fail for a get and a message 2015-05-26 17:00:07 +02:00
Dhanya Maliakal
cb51de145b Merge branch 'startlater' 2015-05-26 12:31:51 +02:00