detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +02:00
Code Issues Actions Packages Releases Activity
904 Commits 44 Branches 100 Tags
Commit Graph

904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
l_maliakal_d
5d5319caeb included over write functions in eiger class 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@804 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-25 16:00:27 +00:00
l_maliakal_d
8b833b0f7e removed salas code for the time being, implemented overwrite, fixed prob of communciating between detector and receiver for settimer 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@803 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-25 15:32:12 +00:00
sala
b743ab2d04 Added post_json methods 
Added DoxyGen docs skeleton
Added Content-type

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@802 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-25 10:06:31 +00:00
sala
7dccc4fc1a enabled tests 
code cleaned
added exceptions

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@801 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-24 16:20:41 +00:00
sala
87407b5529 not really sure about these changes... added timeout/exceptions 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@800 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-24 16:20:41 +00:00
sala
c44b8d34c7 first implementation of REST and JSON interfaces for eigerReceiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@799 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-24 14:03:44 +00:00
johnson_i
4d797fb3b1 returns implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@798 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-21 09:47:01 +00:00
l_maliakal_d
1557cb1de8 set dynamic range implemented for receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@797 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-20 16:10:25 +00:00
l_maliakal_d
1607ddb096 start and stop receiver for eiger doesnt include transmitting stage. set timer sends to anz type of receiver the num frames and acq period 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@796 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-20 10:23:19 +00:00
l_maliakal_d
b6d18131e8 got rid of sending to detector for sending via cpu flag . not needed for eiger 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@795 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-18 16:43:09 +00:00
l_maliakal_d
ecab716f0a calling eiger class functions, default filename run 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@794 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-18 16:28:13 +00:00
l_maliakal_d
ec88d57127 the basic functions connected to eiger class 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@793 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-18 16:10:41 +00:00
l_maliakal_d
1191fe5674 got rid of egier_reciver ifdef and reorganized the slreceiverfunctionlist 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@792 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-18 15:51:58 +00:00
l_maliakal_d
f25e016f64 removed eiger flag as this is default 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@791 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-18 10:34:50 +00:00
billich
aba94872fa give proper credits for DEBUG(x) macro, I got it from http://stackoverflow.com/a/14256296 (http://stackoverflow.com/questions/14251038/debug-macros-in-c) 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@790 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-17 20:51:57 +00:00
billich
3ec2a602c2 add getStatus() method to EigerReceiverImplementation. 
implement basic configuration cache for EigerReceiverImplementation
adapt eigerReceiverTest to do more checks and make output more readable
improve error tests in EigerReceiverImplementation::initialize()


git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@789 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-17 20:37:10 +00:00
billich
540c3b1971 make all get*() member functions const member functions - looks natural, get*() methods shouldn't change state. 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@788 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-17 18:44:43 +00:00
billich
d29660cad8 add DEBUG(x) macro, remove all those std::cout << .... for debugging. 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@787 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-17 18:35:56 +00:00
l_maliakal_d
2edfb74bcd commented out 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@786 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 11:31:10 +00:00
l_maliakal_d
7dcf83ab28 gt server workign back in c for eiger 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@785 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 11:01:32 +00:00
l_maliakal_d
f6b9f58721 few receiver functionalities implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@784 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 11:00:31 +00:00
l_maliakal_d
91c59ce65e setdethostname not required and get detect hostname should return null if uninitialized 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@783 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 10:58:26 +00:00
l_maliakal_d
899d9d3a9c some eiger rxr functionalities implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@782 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 10:57:24 +00:00
l_maliakal_d
3a9e6a1f97 some eiger rxr functionalities implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@781 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 10:57:18 +00:00
l_maliakal_d
6bb5493893 eiger sends #frames to rxr and gotthard send acp period to rxr. fixed 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@780 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 10:56:27 +00:00
l_maliakal_d
549bd32527 eiger basic functionalities implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@779 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 10:55:31 +00:00
l_maliakal_d
7b51dc1d89 eiger basic functionalities implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@778 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 10:55:14 +00:00
l_maliakal_d
a526dcd50c eiger basic functionalities implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@777 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 10:55:01 +00:00
l_maliakal_d
081cf468e1 eiger basic functionalities implemented 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@776 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 10:54:42 +00:00
l_maliakal_d
8a8ee59474 fixed bug in settings frmes for eiger and not for gotthard 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@775 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-14 10:08:52 +00:00
l_maliakal_d
4f4d8d4caf eigerhighlevel unsigned dac 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@774 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-13 12:54:03 +00:00
johnson_i
1cd85e9e49 Added run status function 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@773 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-13 12:10:32 +00:00
johnson_i
cc96928049 Add High lelel functions 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@772 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-13 12:04:55 +00:00
johnson_i
e9bbc390da Add High lelel functions 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@771 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-13 11:30:34 +00:00
l_maliakal_d
0837c6b0a6 swapping ret when sending and then checking it to to send mess doesnt work. fixed 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@770 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-12 10:15:09 +00:00
l_maliakal_d
833dd75927 set dac should also return get dac 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@769 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-12 10:14:08 +00:00
l_maliakal_d
9e5ede1b38 pccompile for eiger server 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@768 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-12 10:13:43 +00:00
l_maliakal_d
636fb54ec7 swapping ret when sending and then checking it to to send mess doesnt work. fixed 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@767 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-12 10:12:47 +00:00
billich
204a71c51a rename class eigerReceiver to EigerReceiver - start class names with a capital letter. 
make class EigerReceiver an abstract base class with pure virtual public member functions.
So class EigerReceiver defines the interface, but does not expose the implementation.

Add a preliminary dummy implementation for  EigerReceiver.

Add a test program eigerReceiverTest to test the newly created EigerReceiver class. 
Modify the Makefile accordingly.

Example:

$ make eigerReceiverTest
g++  -DSLS_RECEIVER_FUNCTION_LIST -O3 -DEIGER_RECEIVER     -c -o eigerReceiverTest.o eigerReceiverTest.cpp
g++  -DSLS_RECEIVER_FUNCTION_LIST -O3 -DEIGER_RECEIVER     -c -o eigerReceiver.o eigerReceiver.cpp
g++    eigerReceiverTest.o eigerReceiver.o   -o eigerReceiverTest

$ ./eigerReceiverTest
main: start EigerReceiver tests
create(): Return new EigerReceiverImplementation instance.
initialize() with: detectorHostName= detectors_host_name.
getFileName(): Return some_file_name.
main: got file name some_file_name
getFilePath(): Return some_path.
main: got path name some_path
getDynamicRange(): Return 16.
main: got dynamic range 16.
getScanTag(): return 4711.
main: got scan tag 4711.
setFileName() called with some_other_name.
getFileName(): Return some_file_name.
main: got file name  some_file_name after setting to <some_other_name>
setFilePath() called withsome_other_path.
getFilePath(): Return some_path.
main: got file path  some_path after setting to <some_other_path>
setDynamicRange() called with 8.
getDynamicRange(): Return 16.
main: got dynamic range 16 after setting it to 8.
setNumberOfFrames() called with 11.
getNumberOfFrames(): return 42.
enableFileWrite() called with 1.
startReceiver(): return 0.
stopReceiver(): return 0.
abort(): return 0.
getEnableFileWrite() returns 1.
getDetectorHostname(): Return some_host_name.

HeinerBillich/2014-03-11


git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@766 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 16:51:55 +00:00
l_maliakal_d
65d78d017e changed dac into mV 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@765 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 14:17:27 +00:00
l_maliakal_d
f854477aae implemented sending hostname to the receiver for eiger 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@764 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 10:49:35 +00:00
l_maliakal_d
bba0f46b58 change in ifdef eigerreciver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@763 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 09:33:14 +00:00
l_maliakal_d
c74f4787cf changed to set timer in receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@762 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 09:25:24 +00:00
l_maliakal_d
ad22460b42 changed to set timer in receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@761 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 09:25:15 +00:00
l_maliakal_d
5ac7f927d9 enable file write in eiger receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@760 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 09:24:35 +00:00
l_maliakal_d
a9e4ee3c55 frame number form receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@759 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 09:24:08 +00:00
l_maliakal_d
f1729dda30 frame number form receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@758 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 09:24:01 +00:00
l_maliakal_d
a62ba56d78 frame number form receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@757 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 09:23:47 +00:00
l_maliakal_d
c77520b20a frame number form receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@756 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 09:23:29 +00:00
l_maliakal_d
9478a5279c frame number form receiver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@755 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-11 09:23:19 +00:00