detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-08-09 18:10:29 +02:00
Code Issues Actions Packages Releases Activity
9,582 Commits 55 Branches 103 Tags
dev/fix-pattern-generator
Commit Graph
9582 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Maliakal Dhanya 5b2a896ed3 to return if it catches only 16 bytes or less than expected, but compensates for first frame being only 266240 for eiger 2014-11-28 14:28:56 +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
bergamaschi 9ad65bc374 First commit 2014-11-27 09:30:14 +01:00
bergamaschi 5fe8c6e457 multiSlsDetector merging fixed 2014-11-25 12:00:08 +01:00
bergamaschi 1d5580b0d4 JMCB max frames 2014-11-25 11:54:54 +01:00
bergamaschi 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
bergamaschi 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
Maliakal Dhanya 4770d74c12 return even if eiger got only 16 bytes of a packet 2014-11-18 17:29:12 +01:00
sala 2eaefaba3a added log level control 2014-11-18 10:51:52 +01:00
sala 3921dc2bf8 added DEBUG flags 
added REST, DEBUG description in make help
 2014-11-18 10:50:38 +01:00
sala a2fdcce711 fixed non-rest compilation 2014-11-17 17:06:50 +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
sala 9a43fb4082 put REST=no as default 2014-11-17 15:59:11 +01:00
sala f36d742cd3 Merge branch 'eiger_receiver' of gitorious.psi.ch:sls_det_software/sls_receiver_software into eiger_receiver 2014-11-17 15:52:43 +01:00
sala 9b8325bd37 Merge branch 'master' into eiger_receiver 2014-11-17 15:04:42 +01:00
sala 02ab7a4ed0 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2014-11-17 15:00:32 +01:00
sala 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
salaandManuel Guizar 3324667d05 proper thread handling for the REST receiver 2014-11-12 11:54:48 +01:00
salaandManuel Guizar 72bf64ff57 cleaning 2014-11-11 17:02:04 +01:00
salaandManuel Guizar 7c51b06777 Merge branch 'master' into eiger_receiver 
Conflicts:
	include/slsReceiverTCPIPInterface.h
	slsReceiver/slsReceiver.cpp
	src/UDPStandardImplementation.cpp
	src/slsReceiverTCPIPInterface.cpp

it compiles
 2014-11-11 15:54:12 +01:00
salaandManuel Guizar eb0ca1c944 commented overloaded data members 2014-11-07 16:02:28 +01:00
salaandManuel Guizar 3a07f0d785 fixed dr bug 2014-11-07 15:49:06 +01:00
salaandManuel Guizar 9ec5541b58 removed hardcoded DR and nframes 2014-11-07 14:43:17 +01:00
salaandManuel Guizar 8a63e7e184 added log printouts. Added hardcoded REST configuration 2014-11-05 11:44:00 +01:00
bergamaschi a690e4d830 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2014-10-27 12:01:54 +01:00
bergamaschi 72ba2ae901 offset added to receiver funcs 2014-10-27 12:01:29 +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 5acb1419af the version given to esrf 2014-10-16 14:14:34 +02:00
Maliakal Dhanya b85490b528 the version given to esrf 2014-10-16 14:14:20 +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
bergamaschi cd3a502167 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_receiver_software 2014-10-15 09:22:40 +02:00
bergamaschi f2dddd88cd JUNGFRAU detector type added 2014-10-15 09:22:17 +02:00
bergamaschi 327c2106df Some fixes for the CTB 2014-10-14 17:43:25 +02:00
bergamaschi 74ef04e726 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2014-10-14 17:03:50 +02:00
bergamaschi 308b3aa9b1 Client and jungfrau server funcs added for pattern generator 2014-10-14 17:03:13 +02:00
Maliakal Dhanya e94e678f7d receiver bottom module included, and image reconstruction works for all bit modes, receiver still for a half module each, although two of them combined to make one module image 2014-10-14 15:42:32 +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
bergamaschi 2d66e1f731 Added pattern generator - must still implement client-server commands 2014-10-03 10:43:12 +02:00
bergamaschi 18188cd095 Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_software 2014-10-01 10:39:23 +02:00
bergamaschi fec9a30e6a Added jungfrau detector server (not functional, though) 2014-10-01 10:38:47 +02:00
Maliakal Dhanya 665401669e udpport2 module 2014-09-26 11:19:26 +02:00
Maliakal Dhanya d8c7201749 module udpport2 2014-09-26 11:18:59 +02:00