detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-01 18:30:05 +02:00
Code Issues Actions Packages Releases Activity
806 Commits 43 Branches 100 Tags
Commit Graph

214 Commits

Author SHA1 Message Date
l_maliakal_d
4eb233cdf0 reverted Makefile 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@806 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-25 16:05:31 +00:00
l_maliakal_d
9229b06e75 reverted Makefile 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@805 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-25 16:04:58 +00:00
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
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
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
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
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
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
d6184610bb included number of frames function 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@753 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-10 16:16:06 +00:00
l_maliakal_d
b0a3f7d61e added eiger specific files 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@752 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-10 15:26:10 +00:00
l_maliakal_d
79c94ad233 added eiger specific files 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@751 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-10 15:15:46 +00:00
l_maliakal_d
274f8ec5b2 incl eiger argument for reciver 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@750 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-07 14:44:31 +00:00
l_maliakal_d
583281b903 included without root writing 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@749 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-07 12:07:21 +00:00
l_maliakal_d
7f22b3ff99 changed number of files for compressed non root data to one 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@748 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-04 14:07:50 +00:00
l_maliakal_d
f55aebc79b minor changes 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@747 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-04 09:44:12 +00:00
l_maliakal_d
dd1f4ca250 flag for saving both compressed and normal files 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@746 951219d9-93cf-4727-9268-0efd64621fa3
 2014-03-04 09:34:04 +00:00
l_maliakal_d
42cb3a02bb compressionshould wait till files created 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@745 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-27 11:32:18 +00:00
l_maliakal_d
8a5dd0a877 got rid of the time wait in creating files 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@744 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-27 10:53:51 +00:00
l_maliakal_d
7371aea454 compression files created in separate threads and nt in tcp 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@743 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-26 15:32:02 +00:00
l_maliakal_d
a892a8854c compression extended to client side with r_compression 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@742 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-24 14:58:36 +00:00
l_maliakal_d
792e0f3845 create threads and destroy threads should work now 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@741 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-20 14:16:06 +00:00
l_maliakal_d
506ca8d6b0 gotthard works for short frame 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@740 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-20 13:24:40 +00:00
l_maliakal_d
400611f38a gotthard compression bug fix with geteventtype iy going out of bounds 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@738 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-20 10:46:02 +00:00
l_maliakal_d
1b88f322b3 gotthard compression works.. but no short frames 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@737 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-18 16:35:52 +00:00
l_maliakal_d
45a93e827f included compression for gotthard, but doesnt get data 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@736 951219d9-93cf-4727-9268-0efd64621fa3
 2014-02-13 10:51:21 +00:00
l_maliakal_d
fded64f5b1 svn rev updates 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@729 951219d9-93cf-4727-9268-0efd64621fa3
 2014-01-30 17:51:45 +00:00
l_maliakal_d
b1a13a601d changed makefile back from epics, got rid of unnecessary print outs 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@728 951219d9-93cf-4727-9268-0efd64621fa3
 2014-01-30 17:50:12 +00:00
l_maliakal_d
382f5652ea make it work for multi threaded compression receiver for moench only 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@727 951219d9-93cf-4727-9268-0efd64621fa3
 2014-01-30 16:41:22 +00:00