Maliakal Dhanya
4958d198d1
post processing does not wait if more than one positions-Annas change
2014-05-20 17:36:24 +02:00
Anna Bergamaschi
c19bded2a5
test
2014-04-23 09:17:38 +02:00
bergamaschi
2609e249ab
Solved problem with MYTHEN readout
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@820 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-17 14:23:42 +00:00
l_maliakal_d
a79046162f
compiling with and without root defined in makefile.include
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@819 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-09 10:28:53 +00:00
l_maliakal_d
49ea26abb2
Makefile sala refined
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@818 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-07 15:49:59 +00:00
l_maliakal_d
1b2aba80a5
got rid of parameters such as compression and det type in receiver, theymust be sent from client to receiver
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@817 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-07 14:08:07 +00:00
l_maliakal_d
58d3de174f
fixed set dac problem for eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@816 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-02 13:11:47 +00:00
l_maliakal_d
73261a3071
eiger specific for settings to work
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@815 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 14:24:53 +00:00
l_maliakal_d
dd6b0a3470
sala Makefile
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@814 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 10:01:51 +00:00
l_maliakal_d
b4b69ade5f
set settings for eiger drafts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@813 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 08:48:06 +00:00
l_maliakal_d
83064243e1
set settings for eiger drafts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@812 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 08:46:00 +00:00
l_maliakal_d
5ab4a88ec5
set settings for eiger drafts
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@811 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 08:43:39 +00:00
l_maliakal_d
ac350640f3
getmoduleid etc does not apply to eiger
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@810 951219d9-93cf-4727-9268-0efd64621fa3
2014-04-01 08:43:04 +00:00
l_maliakal_d
c45c417a0a
got rid of trigger frame and trigger window to merge with other timing modes
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@809 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-26 14:06:48 +00:00
l_maliakal_d
327db21c59
small variation
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@808 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-26 10:07:15 +00:00
l_maliakal_d
a1bd5cdae6
sala ifdef for now
...
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@807 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-26 09:07:46 +00:00
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
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
