47 Commits

Author SHA1 Message Date
Dhanya Maliakal
12574f4c05 merged zmqdata to developer 2016-10-20 08:46:48 +02:00
Dhanya Maliakal
81d96a047d slsDetector/slsDetectorCommand.cpp 2016-10-20 07:31:53 +02:00
Dhanya Maliakal
749c64204e done showing error when detectors not added in sharedmemory due to connect failure 2016-10-19 08:15:52 +02:00
Dhanya Maliakal
e49f97a03c done showing error when detectors not added in sharedmemory due to connect failure 2016-10-19 08:10:42 +02:00
Dhanya Maliakal
6da59ca382 somewhere, but weird threads 2016-10-05 15:26:58 +02:00
Dhanya Maliakal
7ead69a761 merged with developer after it merged with 2.1.1-rc(deactivate) 2016-10-04 14:10:52 +02:00
Dhanya Maliakal
a4bb3fe4dd merged with 2.1.1-rc inclding deactivate detectr and receiver 2016-10-04 14:06:47 +02:00
Dhanya Maliakal
984698efad merged with developer a lot of bug fixes from 14 sep to 30 sep 2016-10-04 13:36:04 +02:00
Dhanya Maliakal
0979d04693 works for deactivated server and receiver 2016-10-04 07:35:52 +02:00
Dhanya Maliakal
5f4a4b0d90 maybe fixed 16 bit rate corr eiger 2016-09-23 17:15:16 +02:00
Dhanya Maliakal
d904f7b32e adding 16 bit rate correction in eiger 2016-09-23 14:28:20 +02:00
Dhanya Maliakal
1263e80d21 done 2016-09-16 12:49:27 +02:00
Dhanya Maliakal
56a559090d ratecorrection error def fixed 2016-08-11 13:59:05 +02:00
Dhanya Maliakal
56aaaaf182 fixed rate correction to not include 16 bit dr 2016-08-08 15:52:09 +02:00
Dhanya Maliakal
ef9d64de64 got rid of <0.00015 rate correction error check 2016-08-04 17:27:45 +02:00
Dhanya Maliakal
29ba1f4042 changed transmission delay commands to go through network parameters and included 10g flow control 2016-08-04 17:21:16 +02:00
Dhanya Maliakal
d28d737fb9 transmission delay added 2016-08-03 17:03:37 +02:00
Dhanya Maliakal
c0db1a89a8 deactivate for eiger 2016-08-02 10:32:37 +02:00
Dhanya Maliakal
4eba07ca90 added error message tau/subexptime to error list 2016-02-17 18:01:58 +01:00
Dhanya Maliakal
f0c4a4a7e4 almost done 2016-02-08 15:20:19 +01:00
Dhanya Maliakal
c097dfc8b3 two acquires at the same tiem should not be possile. using shared memory to set flag, made all connect use the standard connectControl etc 2015-11-20 16:28:48 +01:00
Dhanya Maliakal
e0464ef782 pulsing client side, and bug fix server side for reset partially 2015-11-19 16:15:59 +01:00
Dhanya Maliakal
8b0895add0 reset counter bit in eiger detector partially or completely 2015-11-17 16:39:36 +01:00
Dhanya Maliakal
66db11421f implemented fifo depth configurable from client 2015-11-17 10:30:53 +01:00
Dhanya Maliakal
271838b2b5 changes to includes clkdivider and flags in gui and modify the server for proper checks 2015-09-10 11:29:15 +02:00
Maliakal Dhanya
7e46a407c6 added trimval function, but sending trimbits from char to int bug 2014-07-21 16:39:36 +02:00
Maliakal Dhanya
828a2dbd17 10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file 2014-07-11 13:06:48 +02:00
Maliakal Dhanya
018b800117 eiger receiver, receiving many packets at a time, with 16,8, 4 bitmode sort of working 2014-07-02 10:55:32 +02: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
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
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
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
d46250a34d frame number form receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@754 951219d9-93cf-4727-9268-0efd64621fa3
2014-03-11 09:22:46 +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
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
8e24fc7ef9 changes to receiver works for data compression. needs optimizing
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@699 951219d9-93cf-4727-9268-0efd64621fa3
2013-11-28 14:31:03 +00:00
l_maliakal_d
13189b6414 included detailed error of settings file could not find
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@655 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-16 13:48:27 +00:00
l_maliakal_d
05f54e996c changed the start and stop receiver error messages to be displayed to the client and not jsus recever
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@640 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-30 14:49:53 +00:00
l_maliakal_d
dde2d91139 changed the error message of outputdir doesn not exist
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@638 951219d9-93cf-4727-9268-0efd64621fa3
2013-07-23 08:26:14 +00:00
l_maliakal_d
bff6dc0a0f added eiger dacs and settings
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@606 951219d9-93cf-4727-9268-0efd64621fa3
2013-06-17 13:23:16 +00:00
l_maliakal_d
0e73372cf8 receiver read frequency from gui can be set now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@567 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-21 13:43:25 +00:00
l_maliakal_d
1e7dfcb6ad error when file path doesnt exist
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@547 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-08 17:31:37 +00:00
l_maliakal_d
6022c9b29e included setroi for multidet
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@464 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:53:44 +00:00
l_maliakal_d
35de710225 included network tab in gui, correctedmulti to be able to clear sls detectors error mask,included coud not set up network parameter error
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@454 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-07 17:34:09 +00:00
l_maliakal_d
9fe499e20c made ports reusable and added cannot connect to these ports in error class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@453 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-06 17:36:03 +00:00
l_maliakal_d
1d03be832f added error mask properly inherited by base; mask exist only for cannot connect to detector, receiver and could not configure mac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@452 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-06 15:22:45 +00:00
l_maliakal_d
09d9e2fd03 forgot to check in error_defs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@446 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-31 12:40:28 +00:00