199 Commits

Author SHA1 Message Date
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
l_maliakal_d
9e7bff2cdd make it work for multi threaded compression receiver for moench only
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@726 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:41:17 +00:00
l_maliakal_d
f3d130a64b make it work for multi threaded compression receiver for moench only
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@725 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:41:06 +00:00
l_maliakal_d
16b7458595 make it work for multi threaded compression receiver for moench only
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@724 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:40:56 +00:00
l_maliakal_d
a39e828e3a make it work for multi threaded compression receiver for moench only
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@723 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:40:45 +00:00
l_maliakal_d
f4deb5856d make it work for multi threaded compression receiver for moench only
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@722 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:40:38 +00:00
l_maliakal_d
c0ed0e231d make it work for multi threaded compression receiver for moench only
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@721 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-30 16:40:28 +00:00
l_maliakal_d
b7bc8fd8e5 changes made for compression- works only for moench with 1 thread
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@720 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-28 15:20:03 +00:00
x04sa
a7ad6b5b66 solevd bug on trimbit retrieving
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@718 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-28 10:17:46 +00:00
l_maliakal_d
15e1ac8750 some debugs commented out
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@715 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-16 10:23:03 +00:00
l_maliakal_d
0df39b24e9 moench should work as well.. without filer
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@714 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-16 09:46:33 +00:00
l_maliakal_d
172d452bb2 works for moench receiver without compression
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@713 951219d9-93cf-4727-9268-0efd64621fa3
2014-01-10 16:11:28 +00:00
l_maliakal_d
356801a3dd improved packet loss statistics and multi threaded locking for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@709 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-17 09:30:46 +00:00
l_maliakal_d
a485e33e82 changed receiver to work with many writer threads for only receiver without compression
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@707 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-16 10:07:08 +00:00
l_maliakal_d
64616be52d changes to slsreceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@703 951219d9-93cf-4727-9268-0efd64621fa3
2013-12-03 08:54:52 +00:00
l_maliakal_d
a952077c1d receiver show count how much listened to
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@702 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-29 12:08:08 +00:00